commited by Weiyi Zheng
Merge branch 'master' of https://github.com/seven90/collaborative_writing

merge
commited by Weiyi Zheng