content for shop
Merge branch 'shop' into gh-pages