added GameState and made some changes to Globals and changed Battle to BattleScreen
Merge branch 'master' of https://github.com/TheJKFever/ThinkTank

Conflicts:
	src/Client/BattleScreen.java
	src/Client/Globals.java
	src/Client/Shot.java
	src/Client/ThinkTankClient.java