Merge branch 'master' of https://github.com/aWarmWalrus/TempoRun

Conflicts:
	TempoRun/src/TheGame.java