thumbnails for categories
Merge branch 'master' of github.com:netguru-training/med_app

Conflicts:
	app/decorators/entry_decorator.rb