delete Gemfile.lock
Merge branch 'master' of github.com:fermin/phonebook