Merge pull request #2 from chewou/master

test
Merge pull request #3 from chewou/master

update master
Update teacher_pickinglist.html
Update teacher_pickinglist.html
test status
Merge pull request #4 from team-xue/production

Production
Update teacher_pickinglist.html
Update teacher_pickinglist.html
Update teacher_pickinglist.html
Update teacher_pickinglist.html
Update teacher_pickinglist.html
Update teacher_pickinglist.html
Merge pull request #5 from team-xue/production

Production
Merge pull request #1 from team-xue/master

把自己的分支和学院主站同步