Merge pull request #1 from juhaniniinimaa/loltiimi

Loltiimi mergetty
Merge pull request #2 from juhaniniinimaa/alpha

uusi metodi alphaan
toinen()
Merge branch 'master' of https://github.com/juhaniniinimaa/testing into alpha