Try to fix
Merge branch 'master' of https://github.com/damienCPE/iMusic

# By DamienCPE
# Via DamienCPE
* 'master' of https://github.com/damienCPE/iMusic:
  debug
  keep debuging
  debug

Conflicts:
	src/partie3/controleur/ControlleurCS.java
	src/partie3/model/PlayerCS.java