删除忽略文件
Merge branch 'master' of https://github.com/sgeniusd/ExamProject

Conflicts:
	.DS_Store