change
Merge branch 'master' of https://github.com/cziszero/try_git

Conflicts:
	two.txt