Merge
Add .gitignore
Replaced old icons by Erichsin's new designed icons