Added rss feed for articles
Merge branch 'rss-feed'

Conflicts:
	app/controllers/articles_controller.rb