Gemfile.lock changed
Did some stuff with pasword confirmation. Not totally working yet
Merge branch 'connor'
Moved the profile into the users controller
Merge branch 'connor' into migration_test
Merge branch 'connor' of https://github.com/connorboyd/Fakeblock into hannah
Changed some stuff for the profile and the friends
Merge branch 'hannah'
Fixed database file for heroku
Merge branch 'master' into connor
Merge branch into connor
Merge branch 'connor' of https://github.com/connorboyd/Fakeblock into hannah
Did a bunch of stuff with the profile page
search
Merge branch 'connor' of https://github.com/connorboyd/Fakeblock into hannah