增加
Merge branch 'master' of github.com:RavenZZ/MingdaoShare

Conflicts:
	conext.js
	manifest.json
怎么写