editted users _form.html.erb
Merge branch 'master' of github.com:Spontraineous/Spontraineous

Conflicts:
	db/schema.rb