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

create shop and category
Merge branch 'master' of https://github.com/tikkss/tsuwari into simplecov

Conflicts:
	.gitignore
	Gemfile.lock