Cambios Cristóbal

Llevar al dashboard
Merge remote-tracking branch 'origin/Back'
Cambios Para Dashboard

Back-End Funcionando, Falta la parte de definir quién administra las
entradas.
Waka waka
dashboard

plop
plop

chorizo con papas
Logout

Ediciones sencillas
Cambios
Corregido

Sdasadsa
Roll Back

Eso
Merge branch 'master' of https://github.com/monkeythecoder/nuevo_ctin
Dashboard completo
Merge branch 'master' of https://github.com/monkeythecoder/nuevo_ctin

Conflicts:
	application/views/dashboard_view.php
Dashboard completo

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

my first committ
Merge branch 'MAN' into Yoshua