Merge branch 'master' of github.com:thuynh02/gameProgramming