La vie me submerge
Merge branch 'master' of github.com:fredmontet/musicmatcher

Conflicts:
	musicmatcher/www/js/musicmatcher.js
Olé
YOLO Merge branch 'master' of github.com:fredmontet/musicmatcher
carte gmap quand la musique est taguée BRABRA!!