Test functions and fixes
Merge branch 'Dev' of https://github.com/dkley/Project1-315 into Dev

Conflicts:
	Project_1/Debug/Database.obj
	Project_1/Debug/Project_1.log
	Project_1/Debug/Project_1.obj
	Project_1/Debug/Table.obj
	Project_1/Table.h