Merge branch 'master' of github.com:thuynh02/gameProgramming
Merge branch 'master' into tonyEdits
Did my best to clean up the code
Merge branch 'tonyEdits'