Commit anti-crash
Merge remote-tracking branch 'origin/master'

Conflicts:
	Game/Timer.pde
	Game/data.txt