fdf

dfdf
fdf

dfdf
	deleted:    app/routes.php
	new file:   n3xadawk.sbg.txt
	modified:   public/images/example.drawIndicator.png
Merge branch 'master' of https://github.com/santymoreira/sgc

Conflicts:
	app/routes.php
	public/images/example.drawIndicator.png

	modified:   app/controllers/EmpleadosController.php
	modified:   app/controllers/ReportesController.php
	modified:   app/models/PDF.php
	new file:   app/routes.php
	modified:   app/views/empleados/listadoBalance.blade.php
	modified:   app/views/empleados/listadoBalance2.blade.php
	modified:   app/views/empleados/textoBusquedaBalance.blade.php
	modified:   app/views/home/layout.blade.php
	modified:   app/views/mapasbalanced/AumentarSatis.blade.php
	modified:   app/views/mapasbalanced/FortaCapDoc.blade.php
	modified:   app/views/mapasbalanced/FortaInterApre.blade.php
	modified:   app/views/mapasbalanced/ImpleSgc.blade.php
	modified:   app/views/mapasbalanced/ImplenGestionProc.blade.php
	modified:   app/views/mapasbalanced/MejorarClimaLab.blade.php
	modified:   app/views/mapasbalanced/OptimiRecu.blade.php
	modified:   app/views/mapasbalanced/PotenInnov.blade.php
	modified:   app/views/mapasbalanced/PotenInves.blade.php
	modified:   app/views/mapasbalanced/cont_audi_bsc.blade.php
	new file:   app/views/reportes/individual_bsc.blade.php
	modified:   public/images/example.drawIndicator.png