favicon
Merge branch 'master' of github.com:inflikr/inflikr.github.io