fixed conflicts
fixes
Merge pull request #53 from CalvinFernandez/cleanmusicmanager

new music manager
Merge music manager