start to fix the mess
Merge branch 'master' of https://github.com/tompudding/spacefight3000

Conflicts:
	modes.py