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

Conflicts:
	CODE/projet/affichage.cpp
	CODE/projet/affichage.h
	CODE/projet/profiler.cpp
	LO21/CODE/build-projet-Desktop_Qt_5_3_0_MSVC2013_64bit-Debug/debug/projet.pdb