viikon 4 palaute
Merge branch 'master' of github.com:tonimalin/ohtu2014