Collisions updated
Merge branch 'master' of https://github.com/vweevers/the-amazing-zombie.git