Added ICON font
Fixed merge conflict in .gitignore