Conflict resolution... already
conflict resolution
Merge branch 'master' of https://github.com/vfang/MusicMe
Merge branch 'master' of https://github.com/vfang/MusicMe
Merge branch 'master' of https://github.com/vfang/MusicMe
Refactored Javascript. Awesome scope.
conflict res