stuff
Merge branch 'master' of https://github.com/cooperation20/cooperation2.0