luis 24/4 noticia gr e css
luis 24/4 noticia gr e css retificada
Merge origin/master

Conflicts:
	Styles/EstiloIndex.css
luisss