Only use user name to determine online users, instead of IP + port + name
Merge branch 'master' of github.com:chenguo/chat

Conflicts:
	chatServer.js