terminación de index

restauracion del problema
terminar problema
Merge branch 'master' of https://github.com/miguelavendano/Junior

Conflicts:
	css/carrusel - julian.css
	.git/MERGE_HEAD