Merge branch 'master' into AddTokenList

1 files changed, 17 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index c61847aab..85c2d15d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,27 @@
-dist
 npm-debug.log
 node_modules
-temp
-.tmp
-.sass-cache
+package-lock.json
+
 app/bower_components
 test/bower_components
 package
+
+temp
+.tmp
+.sass-cache
 .DS_Store
+app/.DS_Store
+
+dist
 builds/
 disc/
-notes.txt
-app/.DS_Store
-development/bundle.js
 builds.zip
-test/integration/bundle.js
+
+development/bundle.js
 development/states.js
+test/integration/bundle.js
+test/background.js
+test/bundle.js
+test/test-bundle.js
+
+notes.txt
\ No newline at end of file