maj des commentaires
merge de malade
Merge branch 'master' of github.com:fredmontet/musicmatcher

Conflicts:
	musicmatcher/www/js/musicmatcher.js