Colours
Merge branch 'master' of https://github.com/Shopify/shopify.github.com