Detalles
Merge branch 'master' of github.com:jenniferdr/clienteServidorPDVSA

Conflicts:
	src/cliente.c
	src/servidor.c