Revert 6c7e76a..2d5bdc4

This rolls back to commit 6c7e76a98adfa1f00d80bf0b0333f7a6753d100b.
algo
Merge branch 'master' of https://github.com/diogoalfa/Tarea_04_ayudantia

Conflicts:
	CodeIgniter_2.1/application/controllers/Inicio.php
	CodeIgniter_2.1/application/models/admin_model.php
	CodeIgniter_2.1/application/views/pagina_principal.php