Merge pull request #56 from LuckyDukang/master

修改了data.sql
添加成绩录取8：2
Merge remote-tracking branch 'remotes/remote_hut/master'
增加老师给学生录入成绩的用excel方式导入
Merge pull request #57 from admq/master

增加老师导入学生成绩功能，以及修改了成绩录入的bug
添加了登陆人显示，更新了数据库
Merge branch 'master' of github.com:yidongnan/HUT

Conflicts:
	src/main/java/com/hut/action/DsxyAction.java
显示第几教学周
Merge remote-tracking branch 'remotes/michael/master'

Conflicts:
	src/main/webapp/script/main.js