update Gemfile.lock
Merge branch 'work'