Collisions working...as far as I can tell
Merge branch 'master' of https://github.com/rjullman/cos426-final