consolidated categories
Merge branch 'master' of https://github.com/katydecorah/katydecorah.github.com