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