In the middle of step 2
Last commit. Doesn't work anymore
Zhimin Connected
UPDATE
Merge branch 'master' of https://github.com/GildericDeruette/ProjetMoodPlayer

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/douai/mines/isic/moodplayer/MoodPlayer.java
SOLVE Conflits
Merge branch 'master' of https://github.com/GildericDeruette/ProjetMoodPlayer

Conflicts:
	app/src/main/java/douai/mines/isic/moodplayer/MoodPlayer.java
UPDATE Conflits