Finish sign in 2
Merge branch 'sign-up'

Conflicts:
	app/controllers/sessions_controller.rb
	app/helpers/sessions_helper.rb
	app/models/.user.rb.swp
	app/models/user.rb
	app/views/layouts/_header.html.erb
	app/views/sessions/new.html.erb
	config/routes.rb
	db/schema.rb
	spec/models/user_spec.rb
fixes