Edit the issue add file
Merge branch 'master' into test_branch

Conflicts:
	issue_add-file.txt
Merge branch 'test_branch'