adding validation for the rss feed
Merge branch 'master' of github.com:dbenamy/monkey-shit

Conflicts:
	app/models/subscription.rb
removing lines