test 2 fixed
Merge remote-tracking branch 'Test/master'

Conflicts:
	test2.txt