add seasonal breads
resolve merge conflict
added notes, completed coding
Merge branch 'master' of github.com:zhangjiannan/com.bread.demo

yes