Did things that Joe changed

:frowning:
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Game.java