from master
Merge branch 'master' of https://github.com/kirantemp/myrepo

Conflicts:
	file1.txt