Search Functionality in music section complete'
Merge branch 'master' of github.com:SM719/DJHero
Dont even know what i changed
fixed merge conflicts