Merge pull request #16 from LinZap/master

0507
add
Merge pull request #51 from st937072012/master

Merge pull request #16 from LinZap/master
5/12整合版(尚未完成學生功能)