fixed some things with collision
Merge pull request #68 from kaitlinhuben/mandy

fixed some things with collision