Editing file by user 1
edit by user 1
Merge branch 'master' of https://github.com/VenkatMadugula1/GitTraining

Conflicts:
	test_New_Madappa.txt