minor
Merge branch 'master' of https://github.com/MariaBarrett/VIPExam2

Conflicts:
	SIFT_Maria.py