Signed-off-by: stephysim <stephanie.simeu@gmail.com>
Merge branch 'master' of github.com:cboillet/LO21

Conflicts:
	CODE/projet/projet.pro.user