otras preguntitas
Merge remote-tracking branch 'origin/master'

Conflicts:
	php/cliente_test2.php