Merge branch 'master' of https://github.com/calebgomer/Google-Play-Music-Extension

Conflicts:
	chrome/popup.html
Made Changes the html