improve collision detection, maybe
Merge branch 'master' of github.com:calebwang/spectacled-porpoise