Trying sockets again

Conflicts:
	index.js
	main.js
Fixed sockets

Conflicts:
	index.js