显示第几教学周
Merge remote-tracking branch 'remotes/michael/master'

Conflicts:
	src/main/webapp/script/main.js
修改了部分小问题
Merge remote-tracking branch 'remotes/michael/master'
Merge pull request #60 from LuckyDukang/master

修改了部分小问题