Merge branch 'gh-pages'
Uncommented all the category texts
Merge branch 'master' into gh-pages