add seasonal breads
resolve merge conflict
add note, complete coding
Merge branch 'teamA'