...
Merge branch 'master' of https://github.com/TomiToivio/mainoskupla
Merge
Merge
Merge conflicts fixed