kolmas committi
Merge branch 'master' of https://github.com/everi/test

Conflicts:
	test.txt