COLLISION HAS FINALLY STOPPED BEING DERPY

ALL HAIL THE LACK OF JITTERY COLLISION
Merge branch 'master' of https://github.com/Bro-Pals/TAG_8