Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/tanaypurwar/rsamples

Conflicts:
	test.txt.txt