explicitly set favicon, so it works in subdirectories
Merge branch 'master' into jekyll

Conflicts:
	index.html