second commit
Merge branch 'master' of https://github.com/jagadeeshvarma/GitTraining

Conflicts:
	test.txt