second commit
Merge branch 'master' of https://github.com/harsh-zymr/gitDemo

Conflicts:
	test.txt