Added music
wut
Merge remote-tracking branch 'origin/master'

Conflicts:
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/6d/6dfd7061b759eaf4c93ada0fd0d16107
	Library/metadata/85/851f4666c7c4ce4468f294d9d37d6882