Merge pull request #7 from wanghuan8088/master

Merge pull request #3 from wanghuan8086/master
ok
ax
q
gg
a
qw
l
asd
x
h
Update 1.txt
add 123

new line
add 456

456
add 789

789
github mod
a
Merge branch 'master' of https://github.com/wanghuan8086/testGit.git

Conflicts:
	1.txt
local
github