New category: show
Fixed showing all images of categories and added a sitemap page
Merged in branch category
removed merge conflicts from gemfile.lock
merge fix