issue1 a

issue1 a
Merge branch 'issue1'

Conflicts:
	text2.txt