Parcial: Formulario de cambio de clave
Fixing some conflicts from T61