Robert Guballa
09ec5b288e
Merge remote-tracking branch 'refs/remotes/origin/project_tests'
# Conflicts:
# CMakeLists.txt
# cmake-build-debug/CMakeFiles/3.30.5/CMakeDetermineCompilerABI_C.bin
# cmake-build-debug/CMakeFiles/3.30.5/CMakeDetermineCompilerABI_CXX.bin
# cmake-build-debug/CMakeFiles/3.30.5/CompilerIdC/a.exe
# cmake-build-debug/CMakeFiles/3.30.5/CompilerIdCXX/a.exe
# cmake-build-debug/CMakeFiles/CMakeConfigureLog.yaml
# cmake-build-debug/CMakeFiles/clion-Debug-log.txt
# cmake-build-debug/Prog3B.exe
# cmake-build-debug/Testing/Temporary/LastTest.log
# cmake-build-debug/compile_commands.json