magre

Signed-off-by: Rick Kong <kqhon@foxmail.com>
Signed-off-by: Rick Kong <kqhon@foxmail.com>
Merge branch 'testb' of https://github.com/Qhongk/test into testb

Conflicts:
	testb.txt

Signed-off-by: Rick Kong <kqhon@foxmail.com>