commit by cat
not a dog
Merge branch 'master' into cat

* master:
  commit by master

Conflicts:
	xx.txt