ekatxt
toka eka
Merge branch 'eka'

merge testi