Merge branch 'master' of git.linkerplus.com:houyt/test007

# Conflicts:
#	test01.txt

test01.txt

@@ -3,5 +3,6 @@
   <p>hello world!</p>
     <h1>welcome to git world</h1>
   <h2>ÕâÊÇÒ»¸öÐÂÊÀ½ç</h2>
+    <h3>new world</h3>
 </html>
 </body>