Dev work and New Webshop
Merge pull request #19 from Waterloodown/master

Dev work and New Webshop