user register with socket.id
Merge branch 'master' of https://github.com/hamidraza/chat-nodejs-express

Conflicts:
	public/js/chat.js