Some collision detection work
Merge branch 'master' of https://github.com/tompudding/spacefight3000

Conflicts:
	game_view.py
	game_world.py
	gobjects/bazooka.py