adding test file to dev branch

adding test file to dev branch
commit to master
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	test.txt