added favicon
pull and fix some conflicts on application.html.erb