Debugging git
Merge branch 'master' of https://github.com/brianla/GameDev