Add music
Merge branch 'dev1'