all working except testSmall
Merge branch 'master' of github.com:kayvannj/CS186

Conflicts:
	bin/src/simpledb/BufferPool.class
	bin/src/simpledb/HeapFile.class
	bin/src/simpledb/HeapPage.class
	src/java/simpledb/BufferPool.java
	src/java/simpledb/HeapFile.java
	src/java/simpledb/HeapFileIterator.java
	src/java/simpledb/HeapPage.java
	src/java/simpledb/HeapPageIterator.java