Collision Resolution now operational
Merge pull request #2 from HugoViala/Collision_Resolution

Collision Resolution now operational