Merge branch 'feature/progress'

eanplatter · eanplatter · commit 061916bb1a48 · 2015-11-24T18:57:03.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ bower_components/
 testBundle.js
 docs/build
 docgenInfo.json
+.idea
