para hacer merge
git tonto
Merge branch 'master' of https://github.com/jenniferdr/clienteServidorPDVSA
conflictos
Conflicts:
	src/cliente.c
	src/servidor.c