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

# Conflicts:
#	test3.txt

test3.txt

@@ -5,6 +5,6 @@
 <h2>just </h2>
 <h3>just </h3>
 <h4>just </h4>
-<h5>just </h5>
+<h5>just new try </h5>
 </html>
 </body>