favicon
Fixed merge conflict and added favicon