branch test, haara2 remote
Merge branch 'haara2' of github.com:Gredu/ohtu-viikko1 into haara2