Quitar estos archivos que se van a subir
Merge branch 'wordpress' of https://github.com/estrategasdigitales/onisuzume into wordpress

Conflicts:
	wp-content/cache/qc-c-db53809ff216a04e6f096601f38ce238-db53809ff216a04e6f096601f38ce238-f3bfeb3387c38d7a557be4d864d67f39
	wp-content/plugins/contact-form-7/languages/wpcf7-es_ES.mo
	wp-content/plugins/contact-form-7/readme.txt
	wp-content/plugins/contact-form-7/wp-contact-form-7.php

Conflictos resueltos