Edited output for SetUnion
Merge remote-tracking branch 'origin/master' into garrett-branch
added stuff
that split
Commit
Merge remote-tracking branch 'origin/garrett-branch'

Conflicts:
	Database Management System/Parser.cpp