add seasonal breads
resolve merge conflict
 added notes, completed coding