temp2 commit and push after temp1 override
Commit and push from temp2!
Merge branch 'master' of https://github.com/supertonsky/git-sandbox.git

Conflicts:
	temp1.txt
	temp2.txt