korjattu testi
Merge pull request #60 from nsikkila/master

df
linkki
Merge branch 'master' of github.com:ohtu2014-halme/ilmoprojekti
ingenting
merge conflict