Lab 7 & Partial Credit
Merge branch 'master' of https://github.com/danielrasmuson/Math130_Automated

Conflicts:
	MasterDatabase.py