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

Conflicts:
	tests/test.txt

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