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

Conflicts:
	Diapos/diapos_soutenance_TER/diapos_soutenance_TER.log
	Diapos/diapos_soutenance_TER/diapos_soutenance_TER.pdf
	Diapos/diapos_soutenance_TER/diapos_soutenance_TER.synctex.gz
	Diapos/diapos_soutenance_TER/diapos_soutenance_TER.tex