Merge branch 'master' of github.com:sunhaowen/PrimeMusic

Conflicts:
	tool/multiRequest.py