Redone did collision

-Using the method Adam came up with at midnight on 9/4
-It's one we both understand, rather than copying and pasting
-There is still an outstanding problem we need to discuss that would
happen regardless of the method we used for detecting collision.