Only 1 test is broken adding the user to the db
Only one test doesn't work (db add)

Conflicts:
	app/views/users/new.html.erb
	spec/requests/user_pages_spec.rb