signin
signin
Merge branch 'sign-in-out'

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/sessions_helper.rb
	app/models/user.rb
	app/views/layouts/_header.html.erb
	config/routes.rb
	spec/requests/authentication_pages_spec.rb