Added comments to the ship vc and view
Merge remote-tracking branch 'origin/master'