cualquier cosa
Merge remote-tracking branch 'origin/master'

Conflicts:
	paginas/galeria/css/indexGaleria.css