klassifizierung besser
Merge branch 'master' of https://github.com/krobol/ComputerVision_SS14_OVGU

Conflicts:
	MyNewOpenCVTestProject/MyNewOpenCVTestProject/main.cpp
merged