Finishes game logic, might be buggy though
Merge branch 'master' into joel/game_logic
Merge pull request #5 from varunrau/joel/game_logic

Joel/game logic