favicon (not yet working) & socket.io in package.json
favicon (not yet working) & socket.io in package.json
Merge branch 'master' of github.com:julialpz/SimpleChatServer

Conflicts:
	js/server.js
Merge pull request #13 from julialpz/master

favicon.ico now functioning