ble ble
Merge branch 'master' of https://github.com/eqmn/Music

Conflicts:
	#Music.xcodeproj/project.xcworkspace/xcshareddata/#Music.xccheckout