merge

merged
Merge branch 'master' of https://github.com/nishant9933/First_Git

Conflicts:
	first.txt