fix
Merge branch 'master' of https://github.com/gaojiexxx/note

Conflicts:
	SystemConf.txt
	a20.txt