Update README.md
konflikti
testejä
Merge branch 'master' of https://github.com/kaint-ohtu/ohtu
Merge branch 'development' of https://github.com/kaint-ohtu/ohtu into development