go
Merge branch 'minzu_dev_beta' of https://github.com/School-of-Innovation-Experiment/provinceManagement into minzu_dev_beta
fix html hint
merge
merge comflict
merge
fix bug @ change rating of subject
deleta a file
display of adminstaff
fix conflict
Merge branch 'minzu_dev_beta' into minzu