estilos landing blog 3
Merge branch 'master' of https://github.com/emergugue/c24-7

Conflicts:
	wp-config.php
estilos landing blog 4
Merge branch 'master' of https://github.com/emergugue/c24-7