改一点问题
uo
Merge remote-tracking branch 'origin/master'

Conflicts:
	Test_regress/src/config.ini
	Test_regress/src/myreport.html
	Test_regress/src/testcase_exam.py
Merge branch 'master' of https://github.com/yilu282/automation_test