modified:   .gitignore
	modified:   app/assets/javascripts/application.js
	modified:   app/views/feeds/_form.html.erb
Merge pull request #95 from scoccia/dev/davide_barbieri/working_on_new_feed

Dev/davide barbieri/working on new feed