fix
Merge branch 'master' of github.com:2000000/Note
fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/other/常识.txt