chenjiebin1984 update
Merge branch 'mychange'

Conflicts:
	num.txt