Set up seed file
Pass feed URL into 'feed_url' attribute rather than 'url'
Merge branch 'development' of github.com:laurentqro/cantine into development

Conflicts:
	app/views/feeds/index.html.haml