fix naming conflict with icon?
Merge pull request #4 from nclsHart/fix-global-gitignore

Fix naming conflict with icon?