l
Merge branch 'local1' of https://github.com/chenjunqi2014/chenlearngit into local1

Conflicts:
	local1file.txt