Update server.js
Merge branch 'develop' of https://github.com/ElFlavio/Darwin into develop