nbproject
Merge branch 'Clélia' into Naty

Conflicts:
	MVC/index.html
commit1
mis à jour
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
aaa
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
view dans views
new views
new modif views
new modification views
nettoyage du dossier MVC
pulizia codice
mustache dans le view lie aux event
modif
fiche romain
dernière motif
OFFICIAL COMMIT