Merge branch 'top-secret' of...

Merge branch 'top-secret' of https://agile.bu.edu/gitlab/ec327_projects/group7project into top-secret

# Conflicts:
#	app/src/main/java/com/example/game2d/Game.java