added favicon
merged