Cambios yoshua

Integrando ....
Cambios

Yosh está loco loco
Merge branch 'master' of https://github.com/monkeythecoder/nuevo_ctin

Conflicts:
	application/views/styles.php