muutoksia
Merge branch 'haara2' of https://github.com/villvirt/ohtu-vk2 into haara2