added text to test.txt
Merge branch 'test_txt_update'

Conflicts:
	python/test.txt