adding branch book
nouveau
resolution de conflit
first commit
Merge branch 'book'
Merge branch 'master' of https://github.com/constint/LOLEMN
nouveau fichier
Merge branch 'book'
first commit
Merge branch 'master' of https://github.com/constint/LOLEMN.git
why
Merge branch 'master' of https://github.com/constint/LOLEMN
new title
new document
fix conflict