gitignore
Merge branch 'master' of github.com:Rom2BE/LSINF2335