- new text.txt 2nd time
Merge branch 'master' of https://github.com/supertonsky/git-sandbox

Conflicts:
	text.txt
Merge branch 'master' of https://github.com/supertonsky/git-sandbox