merge branch
Merge pull request #16 from openjaf/temp

merge branch
update gemfile
Merge branch 'develop' of github.com:openjaf/front-grocer into develop
update layout
Merge pull request #17 from openjaf/develop

Develop