modified:   app/views/feeds/index.html.erb
	modified:   app/views/feeds/show.html.erb
Update show.html.erb
Update show.html.erb
Merge pull request #44 from scoccia/dev/davide_di_carlo/fix_bugs

	modified:   app/views/feeds/index.html.erb