exception removed in Ship.cs
Merge branch 'master' of https://github.com/ms-nenova/JackLondonTeam