Nishanth's 2nd commit
Merge branch 'master' of https://github.com/naistigd/FirstAdventure

Conflicts:
	hello.txt