add tmp/ to .gitignore
update gitignore
add icons
Merge pull request #1 from tamouse/multigenre

Merge Multigenre