Update thanks.tex
Update conclusion.tex
Merge branch 'anna'

Conflicts:
	07-annexes/thanks.tex ==> solved!