Create README.md
Update README.md

add some text
Create index.html
Delete index.html
Delete README.md
add 22222
Merge branch 'test2'

Conflicts:
	2
Merge branch 'master' of https://github.com/xiaoqiaotq/hello-git.git
Merge branch 'test2'
fd
Merge branch 'test2'

Conflicts:
	4
master modify 1
touch master file
test2 modify 1
modify 1 add haha
Merge branch 'master' into test2

Conflicts:
	1
Merge branch 'test2' of https://github.com/xiaoqiaotq/hello-git.git into test2