html5boilerpalter
Merge branch 'master' of github.com:loethen/shopstyle

Conflicts:
	README.md