Sync server.js with server.coffee
Merge pull request #26 from rmm5t/sync-server-js

Sync server.js with server.coffee