Merge conflict
Merge branch 'master' of https://github.com/jasho/GameEngine.git