edit ship 3
Merge pull request #374 from katiewood/master

edit ship 2