Merge pull request #35 from josephcoombes/feature/category_pages

Feature/category pages
Merge branch 'develop' of github.com:josephcoombes/cloverdale into feature/category_pages