test brunch
change issue2
change issue3
Merge branch 'issue3'

Conflicts:
	sample.txt