modified:   app/config/database.php
	modified:   app/config/database.php~
	modified:   app/controllers/MapasBalancedController.php
	modified:   app/controllers/ReportesController.php
	modified:   app/models/PDF.php
	modified:   app/routes.php
	modified:   app/views/mapas/cont_audi_sgc.blade.php
	modified:   app/views/mapasbalanced/cont_audi_bsc.blade.php
	modified:   app/views/mapasbalanced/macroprocesosbsc.blade.php
	modified:   app/views/reportes/empleadosFotos.blade.php
	modified:   app/views/reportes/individual.blade.php
	modified:   app/views/reportes/individualBusqueda.blade.php
	modified:   app/controllers/ReportesController.php
	modified:   app/views/reportes/mensual_empleado.blade.php
	modified:   public/134.PNG
	modified:   public/example.drawIndicator.png
Merge branch 'master' of https://github.com/santymoreira/sgc

reportes