tehtava 11 osa 1
Merge branch 'master' of github.com:santerim/ohtu2014