final touches
Merge branch 'master' of https://github.com/itgeorge/ACME-Spaceship

Conflicts:
	ACME-Spaceship/Scene/game-logic.js