uh
ok
Merge branch 'master' of https://github.com/Biouche/ProjetC.git

Conflicts:
	ProjetC/headers/Constants.h