Poursuite du rapport
Merge branch 'master' of github.com:Wambou/TSP_MonaLisa

Conflicts:
	doc/rapport_final.tex
Merge
Rapport final
Merge branch 'master' of github.com:Wambou/TSP_MonaLisa