[JE] {change test} testfile changed
[JE]{merge} testfile merge

Merge branch 'master' of https://github.com/manueljelinek/sw_test

Conflicts:
	testfile.txt