function added by Susam
function 2 added by susam
Merge remote-tracking branch 'origin/master'

Conflicts:
	test.txt