Merge pull request #1 from liangxing/master

liangxing
add some txt to liscence.txt
merge with no-ff
merge by zz
Merge pull request #1 from zzwar2009/master

合并原作者更新