por el pull
merge
Merge branch 'master' of https://github.com/jenniferdr/clienteServidorPDVSA
merge
Conflicts:
	makefile
Merge branch 'master' of https://github.com/jenniferdr/clienteServidorPDVSA
Merge branch 'master' of https://github.com/jenniferdr/clienteServidorPDVSA
para pull
Merge branch 'master' of https://github.com/jenniferdr/clienteServidorPDVSA
servi