Temporary links to shopify URLs
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/layouts/default.jade