Merge branch 'master' of github.com:thuynh02/gameProgramming
Merge branch 'master' into tonyEdits
Tidied up collisions and started efforts on making the professor enemy. Clamps on homework/exams have also been re-added since they seem to have disappeared
Merge branch 'tonyEdits'