Added calc-collisions
Merge branch 'master' of github.com:clojurecup2014/astrocats