background removal is now at different file with its header
Merge branch 'master' of github.com:pkok/Robolab

Conflicts:
	NaoLeague/FeatureExtraction/build/CMakeFiles/CMakeOutput.log
	NaoLeague/FeatureExtraction/build/CMakeFiles/Makefile2
	NaoLeague/FeatureExtraction/build/CMakeFiles/feature_extraction.dir/CXX.includecache
	NaoLeague/FeatureExtraction/build/CMakeFiles/feature_extraction.dir/DependInfo.cmake
	NaoLeague/FeatureExtraction/build/CMakeFiles/feature_extraction.dir/build.make
	NaoLeague/FeatureExtraction/build/CMakeFiles/feature_extraction.dir/cmake_clean.cmake
	NaoLeague/FeatureExtraction/build/CMakeFiles/feature_extraction.dir/depend.internal
	NaoLeague/FeatureExtraction/build/CMakeFiles/feature_extraction.dir/depend.make
	NaoLeague/FeatureExtraction/build/CMakeFiles/feature_extraction.dir/feature_extraction.cpp.o
	NaoLeague/FeatureExtraction/build/CMakeFiles/feature_extraction.dir/link.txt
	NaoLeague/FeatureExtraction/build/CMakeFiles/feature_extraction.dir/progress.make
	NaoLeague/FeatureExtraction/build/CMakeFiles/progress.marks
	NaoLeague/FeatureExtraction/build/Makefile
	NaoLeague/FeatureExtraction/build/feature_extraction