Catalog
Merge branch 'glen'
Catalog
Fixed everything
Merge branch 'fay' of github.com:glentakahashi/cs143-project1 into fay

Conflicts:
	src/java/simpledb/Catalog.java
Catalog
Fixed everything
Merge branch 'fay' of github.com:glentakahashi/cs143-project1 into fay
Merge branch 'fay'