fixed conflict
treecb9161496a96ccb75a9c149f2b17dbf7eaed041c
-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-- 21027 rapport.tex