解决冲突
Merge branch 'master' of https://github.com/CLOUD-HOME/VOTE.git

Conflicts:
	vote/build/classes/com/cloud/model/Examination.class
	vote/build/classes/com/cloud/servlet/EmployeeServlet.class
	vote/build/classes/com/cloud/servlet/ExaminationServlet.class
	vote/build/classes/com/cloud/util/DBUtil.class