mattwojo/BrandLivingStyleGuide — pull request #4 by mattwojo (2014-10-21 23:50:37+00:00)
Title: Created Color Palette section, updated the layout.jade to make it show 

so there may be a conflict