Merge branch 'master' of github.com:thuynh02/gameProgramming
Merge branch 'master' into tonyEdits
Homeworks and exams now derive from Assignment. InvulTime is also handled in a function outside of the collision test loops.
Homeworks and exams now derive from Assignment. InvulTime is also handled in a function outside of the collision test loops.
Merge branch 'tonyEdits'