remove Gemfile.lock from repository
Merge branch 'work'