Merge branch 'heshuo' into 'master'

test wss

See merge request !21

index.js

-var app = require('express')();
+var express = require('express');
+var app = express();
+app.use(express.static('public'));
 var server = app.listen(3001, function(){
   console.log('http listening on *:3001');
 });
@@ -46,9 +48,6 @@ app.get('/', function(req, res){
  res.send('<h1>Hello world</h1>');
 });
 
-
-// var io = require('socket.io').listen(http);
-
 io.on('connection', function(socket){
     console.log("connection");
     //监听用户登录