Revert "master added z"

This reverts commit 4f81da9a412ef8fd5ad92d7212d4192946e29a5e.

Conflicts:
	z.txt
some commit
delete z
x
dd
x
x
d z
changed y
changed
d z