changes made by git_testing2
Merge https://github.com/bhawna2909/hello-world

Conflicts:
	newfile
changing after merge