update test.txt in develop branch
update test.txt in issue branch
Merge branch 'develop'

Conflicts:
	test.txt
Merge pull request #2 from BananaMonster/master

test