mergeado correctamente
Ingreso Usuario y Edicion
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/Index.jsp
	WebContent/Registro.jsp
Revert "mergeado correctamente"

This reverts commit 9f766467e007773347523517395ff9d0132532a3.

Conflicts:
	WebContent/Index.jsp
	WebContent/Registro.jsp