Steph branch

Fixed a bug in Game::gameLoop
Changed a bit of formatting