#1 test issue
Merge branch 'master' of https://github.com/clouddesign/shop

Conflicts:
	index.html