changes to naming conventions, screen State enum
passing information between screen and Islander
Merge pull request #3 from mike1072/master

mikestuff