master 1244
master修正２
Merge branch 'local1'

Conflicts:
	test.txt

Signed-off-by: chenjunqi2014 <chenjunqi2009.ok@163.com>
marge local1
www
Merge branch 'local1' of https://github.com/chenjunqi2014/chenlearngit into local1

Conflicts:
	test.txt