path
Merge branch 'master' of github.com:CharLLCH/work-for-py

lab pc and the laptop
nlp-conf