seasonal breads added
resolved merge conflict
version 2 completed
merge bug fixed