Changement de machine
Merge branch 'master' of github.com:Matael/projet_auralisation_l2

Conflicts:
	rapport/rapport.pdf