ilkin test commit from sts

Signed-off-by: nikli <ilkin@esrefli.com>
Merge branch 'master' of https://github.com/kalemli/taskometr.git

Conflicts:
	Taskometr/src/test_ilkin.txt
Merge branch 'master' of https://github.com/kalemli/taskometr