Merge pull request #21 from leafdj/master

Fixed the boat naming
organization, boat/island layout changes
Merge pull request #22 from mike1072/master

organization, boat/island layout changes