livre
Merge branch 'master' of github.com:imie-source/DL09_G2

Conflicts:
	livre2

modif
Merge branch 'master' of github.com:imie-source/DL09_G2

Conflicts:
	livre2

dazd
resolution pb 1