Merged gamestate.py into game.py