beginning of main
Merge branch 'development' of github.com:ohtuprojekti/OKKoPa into mainprogram
Merge branch 'development' of github.com:ohtuprojekti/OKKoPa into mainprogram
main + pdf process changes
conflict resolved