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

# Conflicts:
#	new1.txt

new1.txt

@@ -5,6 +5,6 @@
 <h3>3333</h3>
 <h4>this is a new h4</h4>
 hello,world!
-
+hello,world2!
 </body>
 </html>