Retour Manager !
Ca COMPILE !!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	Projet/cursus.h
Merge branch 'master' of https://github.com/Pierre-Gilles/LO21

Conflicts:
	Projet/cursus.h
Merge branch 'master' of https://github.com/Pierre-Gilles/LO21