Added categories.html
Added categories page
derge branch 'categories'

Merging categories and master branch: