change from iss53
added from hot fix
add one line to b.txt from hotfix
Merge branch 'iss533'

Conflicts:
	a.txt

merged from hotfix and iss533
fixed a.txt