Finish sign in
Merge branch 'sign-up'

Conflicts:
	app/helpers/sessions_helper.rb