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

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

Conflicts:
	livre

resolution conflit 1
Merge branch 'master' of https://github.com/imie-source/DL09_G2

Conflicts:
	livre

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