s
Merge branch 'haara2' of github.com:Tontsu/viikko3branchi into haara2