half way through
sign-in-out complete
Merge branch 'sign-in-out'

Conflicts:
	spec/requests/user_pages_spec.rb