.
commit before merge
Merge remote-tracking branch 'refs/remotes/origin/master'
Introduced rolling friction.
Merge remote-tracking branch 'origin/master'
Correcting bug set_or_add for the repulsive force assignment in the System class
Stress control, first implementation. A bit dirty at this point, but seems to work.
Correcting bug in constant stress simulations
Cleaning code
cohesion, rolling friction and pull-off force.
Merge remote-tracking branch 'origin/master'
Wrapping stress controlled mode with option on the command line
Combination between repulsion and cohesion.
Merge remote-tracking branch 'origin/master'
Fixed bug in stress computation in stress controlled case
.
Merge remote-tracking branch 'origin/master'
Solved merging conflict.
only reformatting
Fixing a bug introduced by last bug fix for stress controlled simulation :)