Finish sign in
Merge branch 'master' of github.com:timothybs/sample_app

Conflicts:
	spec/requests/user_pages_spec.rb