commit
commit
Merge branch 'master' of https://github.com/ameybhat/git-repo.git

Conflicts:
	name.txt
commit
commit