add from Koa
Merge branch 'master' of https://github.com/poka-IT/testGitPoka

Conflicts:
	main.cpp