changing ruby version
working on logic
resolved conflicts
Resolved conflicts and other stuff
Merge pull request #7 from nairys/game_logic

Game logic