Efecto
Merge remote-tracking branch 'origin/master'

Conflicts:
	sites/default/files/styles/slider-blog/public/blog-4-prueba2.jpg