Main game state added
Merge remote-tracking branch 'origin/branchTesting'
Merge branch 'master' of https://github.com/khollord/ThirstForKnowledge_CMD_p2