bug
Merge branch 'master' of https://github.com/icechen1/coop-friendship