m
Merge branch 'master' of https://github.com/andreis/spaceapps

Conflicts:
	js/ship.js