collision detection adjustments
Merge branch 'master' of github.com:bgirard/ToJAM2013