fis
Merge branch 'master' of https://github.com/jun-lu/webchat

Conflicts:
	views/set_nickname.ejs