Merge pull request #2 from MagmaRam/master

Updated the ship map to fix several issues
Merge pull request #1 from MementoVile/master

Merge pull request #2 from MagmaRam/master

github stop telling me I'm behind on commits