Merge branch 'alpha'
toinen()
Merge branch 'master' of https://github.com/juhaniniinimaa/testing into alpha
added HOOJO()
Merge branch 'alpha'