[#92] Resolve merge conflicts

AUTHORS

CMakeLists.txt

LICENSE

include/vkcv/Core.hpp

modules/gui/src/vkcv/gui/GUI.cpp

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/particle_simulation/src/main.cpp

projects/path_tracer/.gitignore

projects/path_tracer/CMakeLists.txt

projects/path_tracer/shaders/clearImage.comp

projects/path_tracer/shaders/combineImages.comp

projects/path_tracer/shaders/path_tracer.comp

projects/path_tracer/shaders/presentImage.comp

projects/path_tracer/src/main.cpp

projects/saf_r/.gitignore