small coop changes
Merge branch 'master' of https://github.com/cooplab/standing_convergence
merging with github
small coop changes
fixed merge conflict
hopefully, close to final changes