my new commit
Merge branch 'master' of github.com:niranjanrath/my-project

Conflicts:
	test.txt