有些漏放到配置文件的
Merge remote-tracking branch 'origin/master'

Conflicts:
	Test_regress/src/exam_paper.py