modified:   public/images/example.drawIndicator.png
Merge branch 'master' of https://github.com/santymoreira/sgc

Conflicts:
	public/images/example.drawIndicator.png

	modified:   app/controllers/EmpleadosController.php
	modified:   app/controllers/HomeController.php
	modified:   app/controllers/UserController.php
	new file:   app/models/Documento.php
	modified:   app/routes.php
	new file:   app/views/home/subirArchivo.blade.php
	modified:   app/views/home/welcome.blade.php
	modified:   app/views/mapas/cont_audi_sgc.blade.php
	modified:   app/views/mapas/distancia_sgc.blade.php
	modified:   app/views/mapas/empresas_sgc.blade.php
	modified:   app/views/mapas/exterior_sgc.blade.php
	modified:   app/views/mapas/finanzas_sgc.blade.php
	modified:   app/views/mapas/macroprocesos.blade.php
	modified:   app/views/mapas/marketing_sgc.blade.php
	modified:   app/views/mapas/transporte_sgc.blade.php
	modified:   app/views/reportes/individual.blade.php
	modified:   app/views/reportes/individual_bsc.blade.php
	new file:   app/views/users/checkFiles.blade.php
	modified:   app/views/users/create.blade.php
	modified:   app/views/users/empleados.blade.php
	new file:   app/views/users/upload.blade.php
	modified:   public/32.PNG
	new file:   public/archivos/.pdf
	new file:   public/archivos/Estafeta docente.pdf
	new file:   public/archivos/Estafeta docente1.pdf
	modified:   public/carpetasArchivos/06012832522014-10-032014-10-14.pdf
	modified:   public/carpetasArchivos/06020818382014-10-012014-10-19.pdf
	new file:   public/carpetasArchivos/kk.pdf
	modified:   public/css/bootstrap.min.css
	modified:   public/css/easy-responsive-tabs.css
	new file:   public/css/easy-responsive-tabs1.css
	modified:   public/js/Browser.js
	new file:   public/js/jqBootstrapValidation.js
	new file:   public/js/upfile.js