Merge branch 'b_branch' of https://bdgit.educoder.net/pzb5nr4ph/Wuchunxiang_Git_P2 into c_branch

# Conflicts:
#	src/c.c

src/c.c

@@ -1,2 +1,5 @@
 main
-printf
+printf
+main
+{
+}