this is my work
Merge remote-tracking branch 'origin/forDesigners' into forDesigners

Conflicts:
	shopping/css/style.css
	shopping/index.html
this is page