Added PNG favicon
.
Better icon
Resolved conflicts