ajout slides soir
fix merge

Merge branch 'master' of github.com:reyman/pres-transmondyn

Conflicts:
	presentation.Rmd