Did some stuff with pasword confirmation. Not totally working yet
Merge branch 'connor' into migration_test
fixed search styling
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