collision detection

FINALLY figured out collision detection with help from other students