first add
delete .swp file
Merge branch 'master' of github.com:rockidog/SocketServer