@natehill you merged both pulls into the master branch. Your work needs to be merged against https://github.com/esmero/archipelago_subtheme/tree/public_demo_green branch. I will revert master to its original state, try it again making a single pull from your public_demo_nate against public_demo_green branch and don't merge yet. thanks
@natehill you merged both pulls into the master branch. Your work needs to be merged against https://github.com/esmero/archipelago_subtheme/tree/public_demo_green branch. I will revert master to its original state, try it again making a single pull from your public_demo_nate against public_demo_green branch and don't merge yet. thanks