Merge branch 'master' of http://10.10.10.60:3000/Followind/TestGit

# Conflicts:
#	README.md

README.md

@@ -3,6 +3,7 @@
 For Practice Git operation.
 Git is a distributed version control system.
 Git is free software distributed under the GPL.
+
 Creating a new branch is quick and simple
 The bug has been fixed.
-Add some modifications
+Add some modifications

test.txt

@@ -0,0 +1 @@
+ddd