merged
Merge branch 'master' of github.com:Effessio/catalog
unfinished adding goods by user