Merge branch 'master' of github.com:thuynh02/gameProgramming into kayEdits
Implemented controls display.
Merge branch 'kayEdits'