[#111] Fix merge conflicts

AUTHORS

CMakeLists.txt

LICENSE

projects/CMakeLists.txt

projects/first_mesh/src/main.cpp

.../indirect_dispatch/assets/shaders/motionVectorMinMax.comp

...patch/assets/shaders/motionVectorMinMaxNeighbourhood.comp

...ct_dispatch/assets/shaders/motionVectorVisualisation.comp

projects/indirect_dispatch/src/App.cpp

projects/saf_r/.gitignore

projects/saf_r/CMakeLists.txt

projects/saf_r/shaders/raytracing.comp

projects/saf_r/shaders/shader.frag

projects/saf_r/shaders/shader.vert

projects/saf_r/src/main.cpp

projects/saf_r/src/safrScene.hpp

projects/voxelization/assets/shaders/depthToMoments.comp

projects/voxelization/assets/shaders/shadowBlur.inc

projects/voxelization/assets/shaders/shadowBlurX.comp

projects/voxelization/assets/shaders/shadowBlurY.comp