Merge pull request #1 from stuycs-ml7-projects/sarah
Merge branch 'sarah' of https://github.com/stuycs-ml7-projects/musicplayer into sarah