Add .idea to .gitignore
Merge commit '36b990c7abc8447a4c1703baa476413fe0258ef2' into gh-pages
Add planning and description for pixilation workshop