Edited the README again on dev
resolved conflicts
Merge branches 'dev' and 'master' of github.com:hiryou/pandora_extractor into dev
fixed conflicts in README
Edited README
clean up and prepare to officially start upgrading on dev branch
modify README.md
add src/MY_MUSIC/README