changes done to file test1.txt with iss 53 with branch iss53 as master
changes done with hotfix branch
Merge branch 'iss53'

Conflicts:
	test1.txt