Added TurnManager to Game
Merging conflicts in Game.java (same changes where made) and State.java