Finish sign in
up to date
Merge branch 'updating-users'

Conflicts:
	Gemfile
test1
test2
test3
test5
test6