added lab4
Merge remote-tracking branch 'upstream/master'

Conflicts:
	mysimpledb/src/java/simpledb/IntegerAggregator.java
Lab 4 milestone 2