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

Conflicts:
	views/set_nickname.ejs
add fis
add fis sh
readme.md
Merge pull request #69 from jun-lu/master

获取更新