Updated some settings
Merge branch 'master' of https://github.com/wmalquitar23/Game