Merge branch 'cory' of https://github.com/kayvannj/CS186 into kayvan
Merge pull request #1 from kayvannj/cory

Cory
Merge branch 'kayvan' of https://github.com/kayvannj/CS186 into kayvan
Merge pull request #2 from kayvannj/cory

Adding ParentAggregator
Merge branch 'kayvan' of https://github.com/kayvannj/CS186 into kayvan
Aggregator test all pass