Fixed timer bug
Merge branch 'master' of github.com:kpmmmurphy/LD48

Conflicts:
	core/src/org/intothedeep/ld48/screens/GameScreen.java