Remove Gemfile.lock
Merge Master.