Adds turn logic and game classes
Merges master and fixes conflicts
Removes merge conflict leftover
Moves import statements
Merge pull request #4 from varunrau/joel/game_logic

Adds turn logic and game classes