aaa
Merge branch 'master' of github.com:510891769/shmilystore

Conflicts:
	listone/SH00003.jpg
	listone/SH00004.jpg