commit para eme
Merge branch 'master' of https://github.com/emergugue/c24-7

Conflicts:
	wp-content/themes/clima/style.css