Test
Merge branch 'master' of https://github.com/damienCPE/iMusic

# By DamienCPE
# Via DamienCPE
* 'master' of https://github.com/damienCPE/iMusic:
  temp changement

Conflicts:
	src/partie1/Player.java