Cleaned up the game state code and fixed segmentation fault
Merge branch 'master' of https://github.com/simplerr/Project-TDDI02