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

edit ship 3