difference, union wip
Merge branch 'Dev' of https://github.com/dkley/Project1-315 into Dev

Conflicts:
	Project_1/Debug/CL.read.1.tlog
	Project_1/Debug/CL.write.1.tlog
	Project_1/Debug/Database.obj
	Project_1/Debug/Project_1.log
	Project_1/Debug/Table.obj
	Project_1/Debug/link.write.1.tlog
	Project_1/Debug/rc.write.1.tlog
	Project_1/Debug/vc100.idb
	Project_1/Debug/vc100.pdb
	Project_1/Table.h
Merge branch 'Dev' of https://github.com/dkley/Project1-315 into Dev