Collision behaviour added
Merge conflict resolved¸
Merge pull request #28 from benbonjour/master

Collisions more fun