Merge branch 'ZachBranch'

Conflicts:
	TinyTank/src/com/tiny/tank/Select_Weapons_Menu.java
changed the switch between states statement
Need a way for user to select weapons?
need a way for the user to select weapons?
changing dependencies
Merge branch 'master' of https://github.com/Zylox/GroupBeta.git
minor stuff
Merge branch 'ZachBranch'

Conflicts:
	TinyTank/src/com/tiny/tank/Select_Weapons_Menu.java
please work
Not much
Merge branch 'Riemann'

Conflicts:
	TinyTank/src/com/tiny/tank/Select_Weapons_Menu.java
attemp two
Merge branch 'master' of https://github.com/Zylox/GroupBeta.git
hopefully this works
fixed size of shot
implemented  buttons. 
With Ben R.
implemented a simple button until we get a better one from ben
Added fill shot
added a getLinearHeightMapPoint() method
nothing actually