added seasonal breads
resolve merge conflict
added notes, completed coding
Merge branch 'r2_index'
bug fix, v1.1 for production