Ship select added
Fixed merge conflicts
Merge pull request #18 from garethleonard/master

Ship select and fixed merge conflicts