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

Conflicts:
	application/config/database.php
	application/models/home_model.php
	application/views/footer.php
	application/views/header.php