add seasonal breads
resolve merge confilct
Merge branch 'master' of https://github.com/kevinczhang/com.bread.demo