Merge branch 'Naty' into Clélia
Merge branch 'Naty' into Clélia
Merge branch 'Naty' into Clélia
jk
Merge branch 'Clélia' of https://github.com/comem/mmready-test into Clélia

Conflicts:
	MVC/index.html
Merge branch 'master' into Naty
AdvancedResearch
Merge branch 'Clélia' into Naty

Conflicts:
	MVC/index.html
artist list
Merge branch 'Naty' into Clélia
mise a jour
ss
delete clelia main
Merge branch 'Clélia' into Naty
delete conflit
sdad
Merge branch 'Naty' into Clélia
MergeNatiEvent&Artist
main clelia
new name main_clelia.js