adaptation a mon ordinateur
Merge branch 'master' of https://github.com/LabellersGuild/etiquette3D
Test commit
change executable to bin/main
minor CMake changes, cleaner and with comments
merge conflict fix