Here is some collision stuff.
Merge branch 'master' of https://github.com/obec/GGJ2013