arreglo mas estilo
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/testThemeUN/images/de_que_hablar_back.jpg
	themes/testThemeUN/style.css
Merge branch 'master' of https://github.com/nailujpeloz/wp-content

Conflicts:
	themes/testThemeUN/style.css