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
Merge branch 'master' of https://github.com/Zylox/GroupBeta.git
hopefully this works