master's change
Merge branch 'fix_issue'

Conflicts:
	Test task.txt
1 master change
2 fix change
Merge branch 'fix_issue'