fix
Merge branch 'janiv' of github.com:Jylhis/lappia-peli into janiv