Edit gemfile
Edit conflict
Add gemfile.lock changes
Merge branch 'master' of github.com:dima11221122/taskmanager