I've complied all the code together. We're only missing one method, renaming, I'm still waiting on Elizabeth for that one. We also need to test my projection method, as well as Zerr's setDifference and setUnion. We also need to write some tests that combine methods to check for consistancy. I'm really worried that things might have gotten hairy with pointers.
Merge branch 'master' of https://github.com/eakellogg/TeamProject1

Conflicts:
	DBMS/DBMS/EnginesetDifference.cpp
	DBMS/DBMS/EnginesetUnion.cpp
We need to test for consitancy, make sure multiple methods don't interact poorly. Add Elizabeth's method. Test my projection and zerr's setDifference and setUnion