contour features
Merge branch 'master' of https://github.com/DarthBo/beeldverwerking-project

Conflicts:
	src/main.cpp