third change
fourth change
Merge branch 'master' of github.com:niranjanrath/myproject

Conflicts:
	test.txt