blah
Merge branch 'master' of https://github.com/jackarendt/new_music

Conflicts:
	Music Queue/JARootViewController.m