Merge branch 'master' of ssh://bilbo.iut-bm.univ-fcomte.fr/chloroplast13

diff --combined main.tex
index 8b1835f0d2458b6eeb2757adc7eea5efa204d79c,e8e1ecacd0a01b26ce88e693c00bc54a970e10f4..02ff0acfc1665091bcfb618a6ed9e7937aecece9
--- 1/main.tex
--- 2/main.tex
+++ b/main.tex
@@@ -59,7 -59,7 +59,7 @@@ and Michel Salomon*\
  
  \section{Annotated-based Approach}
  % Main author : bassam
 -
 +\input{annotated}
  
  
  
@@@ -73,6 -73,7 +73,7 @@@
  
  
  \bibliographystyle{plain}
+ 
  \bibliography{biblio}