加测试
234
Merge branch 'master' of https://github.com/yudaxue/myGitRepository

Conflicts:
	daxue/test.php