Ajout diapo
Merge branch 'master' of github.com:Matael/projet_auralisation_l2

Conflicts:
	diapo/diapo.out
	diapo/diapo.pdf
	diapo/diapo.tex
END