added socket.io still works just socket io client doesnt see the end point
Merge branch 'master' of github.com:joewarren/jeffica

Conflicts:
	package.json
	server.js