Merge branch 'master' of github.com:thuynh02/gameProgramming
Merge branch 'master' into tonyEdits
Colliding w/ homeworks now causes blinking and shield damage! Yay
Merge branch 'tonyEdits'