Cambios del Yoch
Cambios Yosh
Proyectos casi ready
Dashboard completo
Merge branch 'master' of https://github.com/monkeythecoder/nuevo_ctin

Conflicts:
	application/views/dashboard_view.php
Dashboard completo

(ahora si)
HOME
Quite un Logout extra
Merge branch 'Yoshua'
Otra base de datos
cambio logo con margenes

my first committ