Collisions
Merge branch 'master' of https://github.com/lsnickolov/ChaosRPG.git