new changes
Merge branch 'master' of https://github.com/Brandon-Schur/DB-Project

Conflicts:
	mfstruct.cpp