verify merge commit
Merge branch 'master' of github.com:armand-wang/learngit

Conflicts:
	cat.txt
fix 1
fix 2