modified:   main.cpp
Merge branch 'master' of github.com:gauss1314/music-player