Join Test Pass
Merge branch 'kayvan' of https://github.com/kayvannj/CS186 into cory
StringAggregatorTest and IntegerAggregatorTest pass including COUNT