Edited output for SetUnion
Merge remote-tracking branch 'origin/master' into garrett-branch
stuff patrick added
operand
merge conflict
merge conflict
took off
merge conflict
took off
added stuff
that split
what i have so far
merged
Merge branch 'eliutt-branch'
Commit
Merge remote-tracking branch 'origin/garrett-branch'

Conflicts:
	Database Management System/Parser.cpp
Push Push
selection and unit tests
edited detached head
took off my stupid comments