...
Ajout crypto+images.
Merge branch 'master' into alex

Conflicts:
	slides.md
Ajout de machins.
Add images.