shit
shit2
shit3
shit4
shit5
shit6
Merge remote-tracking branch 'origin/huntercen' into dev

Conflicts:
	.classpath
更新
Merge branch 'canlee' of https://github.com/matrixj/student.git into canlee
Merge remote-tracking branch 'origin/dev' into canlee
1、添加了数据库表teacher_subject的外键
2、增加了实体类
1、 不知道更新了什么
Merge remote-tracking branch 'origin/dev' into linyaohua

Conflicts:
	.classpath
	WebContent/WEB-INF/web.xml
	src/com/student/repository/TeacherMessageControler.java