correct users
check
Merge branch 'updating-users'

Conflicts:
	app/views/sessions/new.html.erb
	spec/requests/authentication_pages_spec.rb