14
Merge branch 'master' of github.com:maleev/Koranso

Conflicts:
	TextDoc.txt