comment
test
Merge branch 'test'

Conflicts:
	python/config.txt
added more test