moved collision into seperate file
Merge branch 'master' of github.com:Matt-Esch/surfacedb

* 'master' of github.com:Matt-Esch/surfacedb: