add collision resolution logic
Merge branch 'master' of https://github.com/rarietta/ProjectionBasedDynamics