Merge pull request #7 from nairys/game_logic

Game logic
most game logic complete
Merge branch 'master' into game_logic