commit1
Merge remote-tracking branch 'origin/Naty' into Clélia

Conflicts:
	MVC/index.html
	MVC/js/main_Naty.js
	MVC/js/views/artistsList.html
	MVC/js/views/showArtist.html
dernier commit
Merge branch 'Clélia' into Naty

Conflicts:
	MVC/index.html
	MVC/js/main_Naty.js
	MVC/js/views/artistsList.html
	MVC/js/views/showArtist.html
Merge branch 'Naty' of https://github.com/comem/mmready-test into Naty

Conflicts:
	MVC/js/main_Clelia.js
	MVC/js/main_Naty.js