Combined my four methods with Nathans. All tests run green. Try to break it.
Merge branch 'master' of https://github.com/eakellogg/TeamProject1

Conflicts:
	DBMS/DBMS/EngineCrossProduct.cpp
	DBMS/DBMS/EngineNaturalJoin.cpp