Profile page is almost done. Still need to add all the user info stuff though
Commented out some unnecessary queries
Added user info things on the profile. Started work on the friends stuff
Friend requests kind of work now. You can't accept or deny them, but you can send them.
user preferences
Added a migration to remove some redundant columns we had
Merge branch 'hannah' into connor

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/profile.html.erb
Ran migration
preference link
merge