Texture features and GPU example [testing]

needs OpenCV linked to CUDA
http://forums.udacity.com/questions/100018536/how-to-install-cuda-opencv-on-windows-with-visual-studio
Merge branch 'master' of https://github.com/DarthBo/beeldverwerking-project

Conflicts:
	src/main.cpp