added seasonal breads
resolve merge conflict
added notes. completed coding
Merge branch 'verzija_1'