diff --git a/hello.py b/hello.py
new file mode 100644
index 0000000..b206673
--- /dev/null
+++ b/hello.py
@@ -0,0 +1,2 @@
+#use coding utf-8
+print("hello world")
diff --git a/readme.txt b/readme.txt
index 2c65fc9..b5da361 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,4 +3,4 @@ Git is a free software distributed under the GPL.
 Git has a mutable index called stage.
 Git tracks changes.
 Creating a new branch is quick and simple.
-Git can merge branches.
+Git can merge branches with no-ff.