edit ship 1
Merge pull request #372 from katiewood/master

edit ship 1