5
d
Merge branch 'master' of https://github.com/projetBilogStage/projet_bilog_stage.git

Conflicts:
	Langues/FR/langue_fr.php
Merge branch 'master' of https://github.com/projetBilogStage/projet_bilog_stage.git