merging
merging
Merge branch 'master' of https://github.com/RCJurriaans/CV_OR

Conflicts:
	FinalProject/extractfeatures.m