+1
Merge branch 'master' of https://github.com:443/xe11/GenaLabanPkr.git

Conflicts:
	src/test.txt