modify model Shop and Category
Merge pull request #7 from tikkss/food

Food CRUD
Merge branch 'master' of https://github.com/tikkss/tsuwari into shop
modify views shops
Merge pull request #8 from tikkss/shop

Modify models and views
Added. Gemfileにgemを追加

以下gemを追加しました
bootstrap-sass
factory_girl_rails
faker
paperclip
pry-rail
shoulda-matchers