添加回调函数的说明
Merge branch 'master' of https://github.com/wiiiky/CC

Conflicts:
	Code Conventions.odt
	Code Conventions.pdf