update spaceship
Merge branch 'master' of https://github.com/gerardsimons/CGA_Game.git

Conflicts:
	main.cpp