modified:   app/models/category.rb
	modified:   app/models/gallery.rb
	modified:   app/views/categories/show.html.erb
Merge remote-tracking branch 'upstream/master'
	new file:   db/migrate/20140719191720_add_category_to_galleries.rb
	modified:   db/schema.rb
Merge remote-tracking branch 'upstream/master'
fix category pages