Changed a few variables to enable gui development
Merge branch 'master' of https://github.com/AGameProject/AGame