add node_modules
modify gitignore
Merge branch 'master' of https://github.com/laodao/webim