plop
Merge branch 'master' of github.com:ruytoor/M1S2

Conflicts:
	workspace/Projet2IHM/src/controleur/AleatoireAction.java
	workspace/Projet2IHM/src/controleur/BackAction.java
	workspace/Projet2IHM/src/controleur/NextAction.java
	workspace/Projet2IHM/src/controleur/PlayAction.java
	workspace/Projet2IHM/src/controleur/StopAction.java
	workspace/Projet2IHM/src/main/JTunes.java
	workspace/Projet2IHM/src/vue/LectureDeFichier.java