Try catch
Merge branch 'master' of https://github.com/shannontan94/cs143-lab1

Conflicts:
	src/java/simpledb/TupleDesc.java
Final fix