changed colors
merge
Added favicon