Merge branch 'master' of heroku.com:koodikorv
Merge branch 'master' of https://github.com/kmetsand/Koodikorv