Merge branch 'master' into AdamBranch

Conflicts:
	TinyTank/src/com/tiny/tank/HUD.java
	TinyTank/src/com/tiny/tank/Main_Gameplay.java
Update TODO List
Update TODO List
Added getters and setters in GameOver
Merge branch 'master' of https://github.com/Zylox/GroupBeta.git
Edited TODO list
Making weapons tag wider
Fixing weapons tag
Merge branch 'master' of https://github.com/Zylox/GroupBeta.git
Merge branch 'AdamBranch'
Game over Background made
Added game over background to game over page
Changed tanks, working on barrel angles
Barrel Rotation works, also fixed fps counter not coming on after
loading state.
Barrel Rotation works, also fixed fps counter not coming on after
loading state.
Merge branch 'RDesktop' of https://github.com/Zylox/GroupBeta.git into RDesktop
Merge branch 'RDesktop' of https://github.com/Zylox/GroupBeta.git into
RDesktop
Merge branch 'master' of https://github.com/Zylox/GroupBeta.git
Barrel Angle limits set
Merge branch 'master' of https://github.com/Zylox/GroupBeta.git