actualización de index
Merge branch 'master' of https://github.com/uvicate/InstitutoAmerica

Conflicts:
	modules/main/inicio/css/style.css