What did I commit?
Merge branch 'master' of https://github.com/MariaBarrett/SPExam4

Conflicts:
	loadingfiles.py