c
ok
d
Merge branch 'master' of https://github.com/projetedt/edt

Conflicts:
	accueil.php