kati
Merge branch 'master' of https://github.com/jaagup/esihoidla

Conflicts:
	tervitus.txt