R+S Fixed collision detection.
Merge branch 'master' of github.com:twlevelup/syd-levelup-2-red-team