final music
Merge branch 'master' of https://github.com/unclehighbrow/blong

Conflicts:
	Blong.xcodeproj/project.pbxproj