Merge branch 'master' of https://gogs.univ-littoral.fr/jdehos/tutoriel_git

Conflicts:
	www/template_slidy.html