something must be broken with iterator dispatch but I have no idea
Merge branch 'master' of https://github.com/ulysses-sl/cosc460

Conflicts:
	mysimpledb/.idea/workspace.xml
	mysimpledb/dist/simpledb.jar
	mysimpledb/src/java/simpledb/Insert.java
	mysimpledb/src/java/simpledb/Predicate.java
	mysimpledb/src/java/simpledb/TupleDesc.java