commit1
Merge branch 'master' of github.com:blue7wings/WxShop

Conflicts:
	README.md