Git add
new file .gitignore
test
Update README.md
Update README.md
Merge remote-tracking branch 'origin/test' into test

Conflicts:
	README.md
test
add info
new file test
delete
sdf
dele
rename
add info
add info
添加信息