Pulling the latest
Merge branch 'master' of https://github.com/tamirh-uci/cs222-db

Conflicts:
	cs222/src/ix/ix_combined.cc
Merge conflict