inital
update gemfile
change gemfile
changed home
updating users
adding migration
pushing to heroku
resolving conflicts
Merge branch 'following-users'
pulling