MATALO MAYINBU!!!!!

KAMEKAMEKAMEJA
Merge branch 'master' of https://github.com/geyserG/proyectoEscolar

Conflicts:
	CRMQualium/application/config/routes.php
	CRMQualium/application/controllers/escritorio.php
	CRMQualium/application/models/model_customer.php
	CRMQualium/application/models/modelo_rit.php
	CRMQualium/application/views/cabecra_y_menu.html
	CRMQualium/application/views/modulo_proyectos_nuevo.php