4th conflict 1st
Merge branch'dog' of https://github.com/shitiGiti/git-test into dog

Conflicts:
	dog.tzz