added favicon
fixed gitignore conflict
fixed gitignore conflict