Delete sftp-config.json
Delete wp-config.php
Avance beta
change
Merge remote-tracking branch 'origin/FdoSilva' into FdoSilva

Conflicts:
	wp-config.php
yup
Merge branch 'master' of https://github.com/idaChile/newEQP2014