commit
Merge branch 'master' of github.com:ZhaoZijie/shop

Conflicts:
	app/views/static_pages/home.html.erb