Merge branch 'master' of https://github.com/gabbene23/DatabaseManagement

Conflicts:
	Design Project/Design Project - Greg Abbene.docx
Merge branch 'master' of https://github.com/gabbene23/DatabaseManagement