Bibliographie added.
Merge conflict fixed.