Added music controller line
Merge branch 'Music'