optimized algo
Merge branch 'master' of https://github.com/cpetry/Mustererkennung

Conflicts:
	Uebung5/Uebung5.v12.suo
	Uebung5/main_gui.cpp
	Uebung5/preprocessing.cpp