ignore this

ignore
Merge branch 'master' of https://github.com/stephoho/cs186-PROJ2

Conflicts:
	bin/src/simpledb/Catalog.class
	bin/src/simpledb/Parser.class
	bin/src/simpledb/TableStats.class