1、忽略
Merge branch 'dev' of https://github.com/matrixj/student.git into dev
1、添加了阻止用户直接访问jsp页面的过滤器
Merge remote-tracking branch 'origin/huntercen' into dev
Merge remote-tracking branch 'origin/canlee' into dev
编写了通用的主页界面
修改背景高度
1、修改了主页界面
2、优化了背景界面
123
忽略
靠
Merge remote-tracking branch 'origin/linyaohua' into dev

Conflicts:
	WebContent/WEB-INF/web.xml
Merge remote-tracking branch 'origin/dev' into canlee

Conflicts:
	WebContent/WEB-INF/db_config.xml
1、增加了添加成绩页面和servlet
学生名单
修改输入成绩
Merge remote-tracking branch 'origin/huntercen' into dev

Conflicts:
	WebContent/WEB-INF/web.xml
Merge remote-tracking branch 'origin/linyaohua' into dev
修改
Merge remote-tracking branch 'origin/dev' into huntercen

Conflicts:
	WebContent/WEB-INF/web.xml