small changes
Merge branch 'master' of github.com:ohtuprojekti/OKKoPa_all
Merge branch 'master' of github.com:ohtuprojekti/OKKoPa_all
Merge branch 'master' of github.com:ohtuprojekti/OKKoPa_all
Merge branch 'master' of github.com:ohtuprojekti/OKKoPa_all
asdf
Merge branch 'master' of github.com:ohtuprojekti/OKKoPa_all
Merge branch 'master' of github.com:ohtuprojekti/OKKoPa_all