The henry way, its less bad
Merge branch 'master' of https://github.com/tompudding/spacefight3000

Conflicts:
	gobjects/projectile.py