l5dfdefede
===============
Merge branch 'master' of http://github.com/imie-source/DL09_G2

Conflicts:
	livre2