no message
Merge branch 'master' of https://github.com/linkleonard/final-destination

Conflicts:
	Assets/Scripts/Ship.cs