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