Merge branch 'master' of https://github.com/sun12520/tc

Conflicts:
	doc/tucao.docx
Merge branch 'master' of https://github.com/sun12520/tc