added favicon
merge conflict