updated gemfile
Merge branch 'master' of https://github.com/harsshhfs/spree_demo_app_2

:q
updated lock file