Merge pull request #6 from kaymmm/favicons

add support for custom favicons and logo
Merge remote-tracking branch 'upstream/master'

merge upstream