-mod:limpiar codigo
Merge branch 'develop' of https://github.com/filianer/cliente_server2 into develop
no message
Merge branch 'develop' of https://github.com/filianer/cliente_server2 into develop

Conflicts:
	cliente.c