first commit
Merge branch 'master' of https://github.com/mrdunk/game_of_tides_0.2

first commit.