.
Merge branch 'master' of https://github.com/diegobechi/sige-utn

Conflicts:
	application/controllers/home.php
agregado user en archvo de base de datos