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

Conflicts:
	workspace/Projet2IHM/src/main/JTunes.java