light modification to some stuff
Merge branch 'master' of https://github.com/simonbw/space-game

Conflicts:
	bin/Spaceship.swf