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

Develop
categories work
creating event and category identifier, reorganized/modularized newsaggregator
changed to mongoDB
Merge branch 'develop' of https://github.com/Sourcely/sourcely into develop
Merge pull request #10 from Zhang/develop

Develop
front end quarter baked
merged in
code bases merged
Merge pull request #12 from kang/develop

code bases merged
committing pre merge
merged
hooked up the server to the front end, successfully populating our webclient
fixed error handling on promisified articleCluster query
Merge pull request #13 from kang/develop

hooked up the server to the front end
started refactoring with factories, and more modularization
merged and adjusting py
modularized controllers