scaffolded
separating the server
Merge pull request #1 from kang/modularizingServer

separating the server
commented out waterline & filepath of database.js
updating bookshelf
Merge pull request #2 from Zhang/develop

Develop
added a newsaggregator tool and separated it from the webclient
configures the database properly with helper functions
database updated and working
Merge branch 'develop' of https://github.com/Sourcely/sourcely into develop
Merge pull request #4 from Zhang/develop

Develop
merged
successfully mereged in
unified code