)
Merge branch 'master' of https://github.com/tubadude49/315-Team-Project-1

Conflicts:
	TeamProject1CSCE315/DBMSMain/table1.txt
	TeamProject1CSCE315/TeamProject1CSCE315/DataManager.cpp