API changes to support Box2D on ubuntu
Merge branch 'master' of github.com:tompudding/spacefight3000

Conflicts:
	game_view.py