Merge pull request #4 from TradeFairs/feature-branch

Merge it
Merge branch 'feature-branch'
Update Test_02.txt
Merge branch 'master'

Conflicts:
	Test_02.txt