añadido edit a users
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/routes.rb
agrgenado problemas
delete
Agregada user show
delete