Add favicon
Resolve Merge