delete test.txt
Merge branch 'master' of github.com:guitilangyin0000/mplayer