Merge branch 'master' of https://github.com/chensen13/TankWarsC

Conflicts:
	bin/DataClass.class
	bin/Game$FloatHealth$TimeHandler.class
	bin/Game$FloatHealth.class
	bin/Game$FloatHealth2$TimeHandler.class
	bin/Game$FloatHealth2.class
	bin/Game$MouseClass.class
	bin/Game.class
	bin/HelpScreen.class
	bin/Weapon.class