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

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