product page
Merge branch 'master' of github.com:anaparunov/startertemplatesass

Conflicts:
	.idea/workspace.xml
merge
udpate