Update to introduce the ability to modify the power and angle of weapons
Merge branch 'master' of https://github.com/tompudding/spacefight3000

Conflicts:
	gobjects/troop.py