test
Merge branch 'master'

Conflicts:
	bin/Game$FloatHealth$TimeHandler.class
	bin/Game$FloatHealth.class
	bin/Game$FloatHealth2$TimeHandler.class
	bin/Game$FloatHealth2.class
	bin/Game.class
	bin/HelpScreen$KeyClass.class
	bin/HelpScreen.class
	bin/LevelScreen.class
	bin/MainScreen.class