Yeah man!
Merge branch 'master' of https://github.com/jonokhor/GitSandbox

Conflicts:
	First file.txt
Another file.
Merge branch 'master' of https://github.com/jonokhor/GitSandbox