Merge branch 'master' of heroku.com:simple-shopping-site
Merge branch 'master' of github.com:yanagi0324/simple_shopping_site