Merge branch 'fenzhi2' into fenzhi3

# Conflicts:
#	.gitignore
#	hello.txt

.gitignore

@@ -1 +1,5 @@
+<<<<<<< HEAD
 *.txt
+=======
+*.txt
+>>>>>>> fenzhi2

1.txt

@@ -0,0 +1 @@
+111

hello.txt

@@ -1,2 +1,2 @@
 hello
-3
+2