test de windows
Merge branch 'master' of https://github.com/fprieur/lab-INF4375

Conflicts:
	Lab2/Exercices.txt