actualizacion de entorno
actualizar gitignore
Merge branch 'master' of https://github.com/LabPLC/infoeconomica
Merge branch 'master' of https://github.com/LabPLC/infoeconomica
link de descarga
Merge branch 'master' of https://github.com/LabPLC/infoeconomica

Conflicts:
	app/views/home.blade.php
Merge branch 'master' of https://github.com/LabPLC/infoeconomica
Merge branch 'master' of https://github.com/LabPLC/infoeconomica
Merge branch 'master' of https://github.com/LabPLC/infoeconomica
Merge branch 'master' of https://github.com/LabPLC/infoeconomica
datos.zip
Merge branch 'master' of https://github.com/LabPLC/infoeconomica