8/7 mariana add categories
Merge branch 'gh-pages' of https://github.com/tfoote/design into gh-pages