modificaciones index
Merge branch 'master' of https://github.com/miguelavendano/Junior

Conflicts:
	css/Carousel-2.0.0.css
	index.html