create shop and category
solve conflict
Merge pull request #3 from tikkss/shop

create shop and category