pull
lMerge branch 'master' of https://github.com/jenniferdr/clienteServidorPDVSA
j
Conflicts:
	RPC_implement/src/dns
con los logs