modified:   app/views/home/layout.blade.php
	modified:   app/views/users/editp.blade.php
	new file:   public/css/bootstrap-theme.css
	new file:   public/css/bootstrap-theme.css.map
	new file:   public/css/bootstrap-theme.min.css
	new file:   public/css/bootstrap.css
	new file:   public/css/bootstrap.css.map
	new file:   public/css/bootstrap.min.css
	new file:   public/fonts/glyphicons-halflings-regular.eot
	new file:   public/fonts/glyphicons-halflings-regular.svg
	new file:   public/fonts/glyphicons-halflings-regular.ttf
Merge branch 'master' of https://github.com/santymoreira/sgc

g
	modified:   app/controllers/EmpleadosController.php
	modified:   app/views/home/layout.blade.php
	new file:   public/css/estilo.css~
	new file:   public/css/style.css~
	modified:   public/images/example.drawIndicator.png
	modified:   app/views/home/layout.blade.php
	modified:   public/images/example.drawIndicator.png
	modified:   app/controllers/ReportesController.php
	modified:   app/routes.php
	modified:   app/views/empleados/listadoBalance.blade.php
	modified:   app/views/empleados/listadoBalance2.blade.php
	modified:   app/views/mapasbalanced/AcredCarr.blade.php
	modified:   app/views/mapasbalanced/PotenVincSociedad.blade.php
	deleted:    public/carpetasArchivos/06011086572014-09-012014-09-02
	deleted:    public/carpetasArchivos/06011086572014-09-022014-09-11
	deleted:    public/carpetasArchivos/06011086572014-09-022014-09-14
	new file:   public/carpetasArchivos/06015290762014-10-012014-10-18.pdf
	deleted:    public/carpetasArchivos/06016633212014-09-032014-09-14
Merge branch 'master' of https://github.com/santymoreira/sgc

h
	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/marketing_sgc.blade.php
	modified:   app/views/mapas/transporte_sgc.blade.php
	modified:   public/images/example.drawIndicator.png