sdkf;s
Merge branch 'master' of https://github.com/iboen/testcosma

Conflicts:
	src/tes_1.txt