modified:   app/views/feeds/index.html.erb
	modified:   app/views/feeds/show.html.erb
	modified:   app/controllers/feeds_controller.rb
Merge pull request #55 from scoccia/dev/davide_di_carlo/fix_bugs

Dev/davide di carlo/fix bugs