Logica resultados
Merge remote-tracking branch 'origin/master'

Conflicts:
	php/cliente_estrategico_2.php