Merge pull request #8 from ZNCatlaw/ship_objects

Ship objects