Merge commit 'origin'
treeaa160ec57ad63a196593eefe7229300a4beb6961
-rw-r--r-- 70 .gitignore
drwxr-xr-x - Presentation.key
-rw-r--r-- 2042 books.bib
drwxr-xr-x - images
-rw-r--r-- 451941 k0530.pdf
-rw-r--r-- 21074 rapport.tex