stuff
Merge branch 'master' of github.com:tompudding/spacefight3000

Conflicts:
	modes.py