Merge branch 'feature'

# Conflicts: # c/test.txt
hello main update
--- a/c/master.c
+++ b/c/master.c
@@ -0,0 +1 @@
 嘻嘻
--- a/c/master2.c
+++ b/c/master2.c
@@ -0,0 +1 @@
 嘿嘿
--- a/c/qiehuan.c
+++ b/c/qiehuan.c
@@ -0,0 +1 @@
 嘤嘤嘤
--- a/c/qiehuan2.c
+++ b/c/qiehuan2.c
@@ -0,0 +1 @@
 嘤嘤嘤
--- a/c/test.txt
+++ b/c/test.txt
@@ -0,0 +1 @@
 hello feature
Upphovsman	SHA1	Meddelande	Datum
ywh	509c7ae0c2	Merge branch 'feature' # Conflicts: # c/test.txt	4 veckor sedan
ywh	57bede27b0	hello main update	4 veckor sedan
ywh	28ebd54677	hello feature	4 veckor sedan
ywh	59e96893a5	hello main	4 veckor sedan
ywh	cae0aa1daa	Merge branch 'feature'	4 veckor sedan
ywh	930dc31bf0	新增master2点c	4 veckor sedan
ywh	e7e6408266	新增master点c	4 veckor sedan
ywh	ff1a955e43	新增了qiehuan2	4 veckor sedan
ywh	0cba71a83f	新增了qiehuan点c	4 veckor sedan