A ver...
Cambios...
Merge branch 'master' of https://github.com/monkeythecoder/nuevo_ctin

Conflicts:
	application/views/styles.php
Revert "Merge branch 'master' of https://github.com/monkeythecoder/nuevo_ctin"

This reverts commit 0c81f1e0bf5e1fae2c58e1b3f3a67c20ed1ef79d, reversing
changes made to 11f46cb51ac71d1c867b34e8b6f6ed42b532c364.
Revert "Revert "Merge branch 'master' of https://github.com/monkeythecoder/nuevo_ctin""

This reverts commit d03e41e92577a696ef1218d52ac36422ff13ace3.
Merge branch 'Yosh-Reloaded'

Conflicts:
	application/controllers/dashboard.php
.konhujimoi,pl`

kiiki
Corregido carga imagen
Cambio en Login y en estilos
Merge branch 'master' into Yosh-Reloaded