Merge branch 'master' of https://github.com/ketayao/learn-git.git

Conflicts:
	A.txt

Signed-off-by: ketayao <ketayao@gmail.com>
modify a.txt