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

Conflicts:
	SystemConf.txt
	a20.txt
fix
Merge branch 'master' of https://github.com/gaojiexxx/note

Conflicts:
	jpeg.txt
fix
Merge remote-tracking branch 'origin/master'
fix
fix
fix
fix
fix
Merge branch 'master' of https://github.com/gaojiexxx/note

Conflicts:
	SystemConf.txt
	TCP-IP协议.txt
fix
fix
fix
fix
fix
fix
Merge branch 'master' of https://github.com/gaojiexxx/note
fix