Revert "Merge branch 'play-queue'"

Conflicts:
	iMusic.xcodeproj/project.pbxproj
	iMusic/Main.storyboard