second commit
Merge branch 'master' of https://github.com/chanrohit2002/test

Conflicts:
	ttt.txt