merging error
Merge branch 'master' of https://github.com/sierraflynn/A_Bakers_Dozen
Merge branch 'master' of https://github.com/sierraflynn/A_Bakers_Dozen
Merge branch 'master' of https://github.com/sierraflynn/A_Bakers_Dozen
static pages and following feature
Merge branch 'master' of https://github.com/sierraflynn/A_Bakers_Dozen