Al changezzz
Merge branch 'master' of https://github.com/xe11/GenaLabanPkr

Conflicts:
	src/test.txt