Update favicon
Update goodies link
Merge branch 'master' into v3

Conflicts:
	assets/favicon.png
	index.html