Jquery
Merge branch 'master' of https://github.com/aaronnech/MusicGraph

Conflicts:
	js/model.musicapi.js