#2 something
Merge branch 'master' of https://github.com/clouddesign/shop
#3 demo
Merge branches 'master' and 'ticket3'