commit by temp2
temp2 2nd commit
temp3 3rd commit for merge
Merge branch 'master' of https://github.com/supertonsky/git-sandbox.git

Conflicts:
	temp1.txt
	temp2.txt