life sucks
Merge http://github.com/aWarmWalrus/temporun

Conflicts:
	TempoRun/src/TheGame.java