final push
Merge branch 'haara2' of github.com:mluukkai/ohtu-viikko1 into haara2