Continuing development of castaway class
Merge branch 'master' of https://github.com/dalaen/TheIsland.git