finished union unit test
adding to union unit test
adding to union test
Merge remote-tracking branch 'origin/waylon-branch'

Conflicts:
	Database Management System/Table.h
merge