Merge branch 'master' of https://github.com/xl8/git-try

Conflicts:
	text.txt
commit
Merge branch 'master' of https://github.com/xl8/git-try

This reverts commit 4d0a8b3e966f419c08b51dde11e2c3d793ff9ac7.

Conflicts:
	text.txt