added music
Merge branch 'temp'
added delete and edit