work in progress on collision code
Merge branch 'master' of github.com:ushu/z-project
fix bad merge