Added category page
Fixed merge conflict