init
Merge branch 'master' of github.com:sviga/shop