modified:   app/controllers/feeds_controller.rb
	modified:   app/views/feeds/_form.html.erb
	modified:   app/views/feeds/edit.html.erb
	modified:   app/views/feeds/index.html.erb
	modified:   app/views/feeds/new.html.erb
	modified:   app/views/feeds/show.html.erb
	modified:   app/views/layouts/application.html.erb
Merge pull request #51 from scoccia/dev/davide_di_carlo/fix_bugs

Dev/davide di carlo/fix bugs