pre merge commit
Merge branch 'master' of https://github.com/SemmZemm/cr12

Conflicts:
	knn.m
	matchedpairsDevTest.txt
	peopleDevTrain.txt
	test.m
	unmatchedpairsDevTest.txt
merged