Updated the link to live feed
Updated with Gen 3 Reddit link
Merge branch 'master' into gh-pages

Conflicts:
	index.html