edit
Merge branch 'master' of https://github.com/zyxstar/exam_c

Conflicts:
	exam/exam.c