roll back a avant que ça chie...
Merge branch 'master' of https://github.com/Ariekor/Disco

Conflicts:
	Discotheque/src/discotheque/JFrameArtistes.form
	Discotheque/src/discotheque/JFrameArtistes.java