Minor fixes on antiipated collision-- bugs still exist.
Merge branch 'master' of https://github.com/devChuk/HackNYU_STUY