test
Merge https://github.com/1marek/prj.test into test2

Conflicts:
	file1.txt