Merge branch 'gh-pages'
Merge branch 'master' into gh-pages
Added UL and LIs, .category-box added to anchor tag
Merge branch 'master' into gh-pages
Merge branch 'gh-pages'
Merge branch 'master' into gh-pages