as
Merge branch 'master' of github.com:tmekkelisti/ohtu-viikko1