Collisions working
Merge branch 'stable_demo' of github.com:tdubourg/geobombing into stable_demo