Add Gemfile.lock
Merge branch 'dev' of github.com:Golfer/Planet-rails-stores into dev
Fix: bootstrap
Merge remote-tracking branch 'origin/dev' into dev