local changes
Merge branch 'master' of https://github.com/felixmeissgeier/AugmentedReality

Conflicts:
	ARExercise.cpp
b/w-image is now a little bit blurred
very small change in fret-detection