fix check
new database
skill
fix conflict
Merge branch 'merge3' of https://github.com/NTUIM-SA-pro/T-man into merge3
Merge branch 'merge3' of https://github.com/NTUIM-SA-pro/T-man into merge3
fix bug
fix bugs