Person-olion luonti
Merge branch 'sami'
Merge branch 'master' of https://github.com/BarCodeKey/BarCodeKey