Merge branch 'Sprites' of https://agile.bu.edu/gitlab/ec327_projects/group5project into Sprites

# Conflicts:
#	.gradle/7.5/executionHistory/executionHistory.bin
#	.gradle/7.5/executionHistory/executionHistory.lock
#	.gradle/7.5/fileHashes/fileHashes.bin
#	.gradle/7.5/fileHashes/fileHashes.lock
#	.gradle/7.5/fileHashes/resourceHashesCache.bin
#	.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	.gradle/buildOutputCleanup/outputFiles.bin
#	.gradle/file-system.probe
#	app/src/main/java/com/example/a8_bitinvader/Player.java