test merge
Merge pull request #6 from lijinchao2007/master

test merge