Merge pull request #60 from nsikkila/master

df
Merge branch 'master' of github.com:ohtu2014-halme/ilmoprojekti