commented out waterline & filepath of database.js
added a newsaggregator tool and separated it from the webclient
Merge pull request #4 from Zhang/develop

Develop
merged
successfully mereged in
unified code
Merge pull request #6 from kang/develop

merge me in
updating server database relationship
merges brian's changes