Merge branch 'master', remote branch 'origin'
Merge remote branch 'origin/master'
editing by zhao jun
Merge remote branch 'origin/master'
new editing
new editing
Merge branch 'master' of https://github.com/cogenda/cogenda-web
Merge branch 'master' of https://github.com/cogenda/cogenda-web
new editing
merge failed, try to fix
recovering index.md
new editting
Merge remote branch 'remotes/origin/master'
new editing, new image file
Merge remote branch 'remotes/origin/master'