Added .idea/ to gitignore
Merge branch 'master' of https://github.com/Veixar/circuit