no message
Merge branch 'master' into Header

Conflicts:
	assets/javascript/main/application.js
	assets/stylesheets/globals/_base.scss
	assets/stylesheets/main.scss
	assets/stylesheets/pages/_home.scss
	assets/stylesheets/pages/product.scss
	assets/stylesheets/sections/_footer.scss
	assets/stylesheets/sections/_header.scss
	scripts/html.ts
	scripts/mappings.ts
	scripts/pages/category.ts
	scripts/pages/product.ts
	scripts/sections/footer.ts
	scripts/sections/header.ts
no message
no message
created header-row-1 and header-row2
Merge branch 'master' into Header