Fixed server.js, connected to mongo
Merge branch 'byron'