添加图片
Merge branch 'master' of https://github.com/zz7zz7zz/openshare.git

Conflicts:
	1.png
	2.png