是是是是d
Merge branch 'master' of https://github.com/dantianxuan/ccinterview.git
合并了。。
消息记录
萨达是
sss
无语了。。
事实上
Merge branch 'master' of https://github.com/dantianxuan/ccinterview.git

Conflicts:
	ccinterview/WebRoot/VIEW/jobseeker/createInterview.vm
	ccinterview/WebRoot/VIEW/jobseeker/interview.vm
	ccinterview/src/com/interviewer/dao/InterviewDAO.java
	ccinterview/src/com/interviewer/pojo/Interview.hbm.xml
	ccinterview/src/com/interviewer/pojo/Interview.java
	ccinterview/src/com/interviewer/view/InterviewerVO.java
	ccinterview/src/com/interviewer/web/BaseController.java
	ccinterview/src/com/interviewer/web/InterviewController.java
	ccinterview/src/com/interviewer/web/JobseekerController.java
	ccinterview/src/hibernate.cfg.xml