cambios
Merge branch 'master' of https://github.com/hugomarin/Beckett-Simonon

Conflicts:
	assets/css/new.min.css
	assets/css/overrides.min.css
	templates/product.liquid
cambios