Finally fixed collisions, again
Merge branch 'master' of https://github.com/mboerwinkle/cloaked-robot