added lab4
Merge branch 'master' of https://github.com/michaelghay/cosc460

Conflicts:
	mysimpledb/src/java/simpledb/IntegerAggregator.java
lab 4 milestone exercises 2-4