Finished user edit/update
Merge branch 'updating-users'

Conflicts:
	app/controllers/sessions_controller.rb
	app/views/layouts/_header.html.erb