done
Merge branch 'sign-in-out'

Conflicts:
	app/views/static_pages/home.html.erb
	spec/requests/static_pages_spec.rb
Finish sign in
Merge branch 'sign-in-out'

ok