Merge branch '8-podrska-za-boje-na-kalendaru' into 'master' Closes #8 and #9 See merge request kbr4/zsterminator!7