refactor server.js
Merge remote-tracking branch 'remotes/github/master'