Revert "Merge branch 'Yoshua' que valio madres :S"

This reverts commit 2123bdd1ca55060c491fd38bef32f3e7ae7087bc, reversing
changes made to 415bce61cc0b63e64354808c129773e0350cee20.
Merge branch 'master' of https://github.com/monkeythecoder/nuevo_ctin

Conflicts:
	application/views/equipo_view.php
	css/reticula1.less
Merge branch 'master' of https://github.com/monkeythecoder/nuevo_ctin