aded published and edited video/audio feeds
Added published and edited video/audio feeds
Merge branch 'master' of github.com:samuel-hill/ga-wdi-rss-project
Merge branch 'master' of github.com:samuel-hill/ga-wdi-rss-project
Merge branch 'master' of github.com:samuel-hill/ga-wdi-rss-project

Conflicts:
	app/views/users/_form.html.erb
settings updatings