ajout
Merge branch 'master' of https://github.com/joakim-d/GroBoy

Conflicts:
	documents_TER/soutenance.odp
Définition de SOUND
Merge branch 'master' of https://github.com/joakim-d/GroBoy

Conflicts:
	documents_TER/soutenance.odp