modif mineur
Merge branch 'master' of https://github.com/AzFleck/projetSon

Conflicts:
	src/Controller/Controller.java
test
Merge branch 'master' of https://github.com/AzFleck/projetSon