Add .idea files back
Add app.iml file back
Add back .idea files
Add .idea/libraries to gitignore
Merge pull request #99 from calblueprint/mark/refix-gitignore

Refix gitignore
Merge branch 'master' into mark/site-view