add the c branch

Signed-off-by: spark.huang <240401736@qq.com>
add the d branch

Signed-off-by: spark.huang <240401736@qq.com>
add the e branch

Signed-off-by: spark.huang <240401736@qq.com>
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	test.txt

Signed-off-by: spark.huang <240401736@qq.com>