Removed macros
Merge branch 'master' of https://github.com/tamirh-uci/cs222-db

Conflicts:
	cs222/src/ix/ix_combined.cc
	cs222/src/rbf/rbcm.cc