new mon
Merge branch 'master' of https://github.com/vaninawohlleb/spf-trial-liquid

Conflicts:
	index.liquid
	shop.css.liquid
	theme.liquid.html