pull
Merge branch 'master' of https://github.com/jenniferdr/clienteServidorPDVSA
pull
Conflicts:
	RPC_implement/src/funciones.c
Merge branch 'master' of https://github.com/jenniferdr/clienteServidorPDVSA
estructura