in Makefile: changed compiler to (CXX) in
Merge branch 'master' into DepthOfField
colorOnePixel function removed, because not necessary