Merge branch 'out_double' into new_branch

# Conflicts:
#	hello.c

hello.c

@@ -11,5 +11,6 @@ void main()
     printf("haode\n");
     printf("制造冲突\n");
 
+    printf("添加新内容\n");
     return 0;    
 }