new file:   CRMQualium/js/backbone/colecciones/ColeccionRepresentantes.js
	new file:   CRMQualium/js/backbone/colecciones/ColeccionServicios.js
	new file:   CRMQualium/js/backbone/colecciones/ColeccionTelefonos.js
	new file:   CRMQualium/js/backbone/modelos/ModeloRepresentante.js
	new file:   CRMQualium/js/backbone/modelos/ModeloServicio.js
	new file:   CRMQualium/js/backbone/modelos/ModeloTelefono.js
	new file:   CRMQualium/js/backbone/vistas/.htaccess
	new file:   CRMQualium/js/backbone/vistas/VistaServicio.js
	new file:   CRMQualium/js/backbone/vistas/subirFotoCliente.php
	new file:   CRMQualium/application/controllers/actividades.php
	new file:   CRMQualium/application/controllers/api_telefono.php
	new file:   CRMQualium/application/controllers/facturas.php
	new file:   CRMQualium/application/controllers/multimedia.php
	new file:   CRMQualium/application/controllers/perfil.php
	new file:   CRMQualium/application/controllers/permisos.php
	new file:   CRMQualium/application/controllers/representante.php
	new file:   CRMQualium/application/controllers/servicios.php
	new file:   CRMQualium/application/controllers/usuarios.php
	new file:   CRMQualium/application/models/model_phone.php
	new file:   CRMQualium/application/models/modelo_actividades.php
	new file:   CRMQualium/application/models/modelo_perfil.php
	new file:   CRMQualium/application/models/modelo_permisos.php
	new file:   CRMQualium/application/models/modelo_representante.php
	new file:   CRMQualium/application/models/modelo_rit.php
	new file:   CRMQualium/application/models/modelo_servicios.php
	new file:   CRMQualium/application/models/modelo_usuarios.php
	new file:   CRMQualium/application/views/pruebas.php
Merge branch 'master' of https://github.com/geyserG/proyectoEscolar

Conflicts:
	CRMQualium/application/models/modelo_rit.php