Update
Merge branch 'master' of https://github.com/anpar/1243

Conflicts:
	physique/labo-s4/labo-s4-slides.tex