Changed branched test
Merge branch 'bugFix'

Added branch and quick fix together!

Conflicts:
	test.txt