connection to external socket
Ruby server and jquery socket connection
fix merge conflicts