avancement
Merge branch 'master' of https://github.com/sorgenh/TERWeka

Conflicts:
	rapport/RapportFinal/Rapport_TERWeka.aux
	rapport/RapportFinal/Rapport_TERWeka.log
	rapport/RapportFinal/Rapport_TERWeka.pdf
	rapport/RapportFinal/Rapport_TERWeka.synctex.gz
	rapport/RapportFinal/Rapport_TERWeka.tex
	rapport/RapportFinal/Rapport_TERWeka.toc