Premier jet diff.
Merge branch 'master' of github.com:nfriedli/git.theologique.ch

Conflicts:
	decouverte/diff.rst