ugh
Merge branch 'master' of https://github.com/sugordon/Tonka.git

Conflicts:
	src/weapon/BasicTurret.java
	src/weapon/Weapon.java