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

# Conflicts:
#	test01.txt

test01.txt

@@ -1,7 +1,15 @@
 body 
+<<<<<<< HEAD
 p1 hhhhhh9
 
 p2 hhhhhg
 p2
 
-90
+90
+=======
+p1 hhhhhhh
+
+p2 hhhhhg
+p2
+80
+>>>>>>> c0feb9688a0d744a3b70ec4f6ce1eee2988e6720