Finish user
Merge branch 'updateing-users'

Conflicts:
	db/schema.rb
	spec/factories.rb