stuff
Merge branch 'master' of github.com:DarthBo/beeldverwerking-project

Conflicts:
	src/main.cpp
	src/svm_utils.h
Merge branch 'master' of github.com:DarthBo/beeldverwerking-project

Conflicts:
	src/main.cpp