temp2 commit
temp2 merge commit

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

Conflicts:
	temp1.txt