daily commit
Merge branch 'master' of https://github.com/nwpu-graduation-project/MindParadise
daily commit
database modified
now working on encyclopdia