Cambios para formulario registro nuevo cliente 50%
Merge branch 'master' of https://github.com/milton01/asi2_equipo

Conflicts:
	application/controllers/welcome.php