Merge `main2` into `main`

main2 was mainly created after the Polytech project to make sure that we weren't going to be accused of modifying the project after the defense. I guess it's OK to merge now.