second commit
Merge branch 'master' of https://github.com/s-rajaraman/practice

Conflicts:
	a.txt