fix
Merge branch 'master' of https://github.com/yuhang2/quku

Conflicts:
	z/program/compare_song.php