test commit
Merge branch 'master' of https://github.com/vikas70289/Task7

Conflicts:
	hi.txt