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

Conflicts:
	View/v_liste_societe.php
Merge branch 'master' of https://github.com/projetBilogStage/projet_bilog_stage.git