remove Gemfile.lock from gitignore
change api request to https
merge conflict resolve