change from cloned haaara2
Merge branch 'haara2' of github.com:SimSaladin/ohtu-viikko1 into haara2