Server.js changes
Merge branch 'master' of https://github.com/joerter/Database