collision stuff
Merge branch 'master' of github.com:TannerRogalsky/kamasutris