get post clave pública y privada
Merge remote-tracking branch 'origin/master'

Conflicts:
	socket_client.js
	socket_server.js