bin issues
Merge branch 'master' of https://github.com/shannontan94/CS143-lab2

Conflicts:
	bin/test/simpledb/CatalogTest.class
	bin/test/simpledb/HeapFileReadTest.class
	bin/test/simpledb/HeapPageIdTest.class
	bin/test/simpledb/HeapPageReadTest.class
	bin/test/simpledb/RecordIdTest.class
	bin/test/simpledb/TestUtil$CreateHeapFile.class
	bin/test/simpledb/TestUtil$LockGrabber.class
	bin/test/simpledb/TestUtil$MockScan.class
	bin/test/simpledb/TestUtil$SkeletonFile.class
	bin/test/simpledb/TestUtil.class
	bin/test/simpledb/TupleDescTest.class
	bin/test/simpledb/TupleTest.class
	bin/test/simpledb/systemtest/ScanTest$1InstrumentedHeapFile.class
	bin/test/simpledb/systemtest/ScanTest.class
	bin/test/simpledb/systemtest/SimpleDbTestBase.class
	bin/test/simpledb/systemtest/SystemTestUtil.class