.
Merge remote-tracking branch 'origin/master'

Conflicts:
	tache8/tache8.tex