Add .idea/ to .gitignore
Merge branch 'master' of github.com:hfaran/piazza-api