committing
Merge branch 'branch2' of https://github.com/ash261080/testgitrepo into branch2

Conflicts:
	2nd branch file.txt