Finish sign in
commit
Merge branch 'sign-in-out'

Conflicts:
	Gemfile.lock