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
Merge pull request #6 from kang/develop

merge me in
updating server database relationship
merges brian's changes
Merge pull request #7 from Zhang/develop

Develop
pushing sql code
Merge pull request #8 from Zhang/develop

pushing sql code
pre-refactor
Merge branch 'develop' of https://github.com/Sourcely/sourcely into develop
Merge pull request #9 from Zhang/develop

Develop