file name resolved
Merge branch 'AbhilashJiesongZhiminMediaPlayerLecture' of https://github.com/GildericDeruette/ProjetMoodPlayer into AbhilashJiesongZhiminMediaPlayerLecture

Conflicts:
	app/src/main/java/douai/mines/isic/moodplayer/AccueilHumeur.java
	app/src/main/res/layout/accueil_humeur.xml