Reupdated everything to the latest version. Push as you develop
Merge branch 'master' of https://github.com/mandiros3/GameWorld