test delete
Revert "test delete"

This reverts commit b29cc702330df868d181d82c35c5c9ace3092780.
Collision Update

I have fixed up the collision glitch involving hitting the bottom of a
platform, the player will now be able to bounce back down instead of
sticking to the platform or going through it. I will continue to work on
the collision with left and right sides of the surfaces in accordance
with my personal rule to not choke a puppy in the process.
Merge remote-tracking branch 'origin/Mike-Branch' into Rob-Branch