Merge pull request #2 from jonbb/kuningaslaadun_branch

juh hene iha chill
Merge pull request #3 from jonbb/kuningaslaadun_brachi

Kuningaslaadun brachi
Merge remote-tracking branch 'chili_vilmurs/master' into kuningaslaadun_branch