Merge branch 'master' of https://github.com/LambdaSchool/JavaScript-I into solution

SunJieMing · SunJieMing · commit dbd0734b000f · 2017-10-02T07:48:33.000-07:00
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -5,16 +5,13 @@
     ],
     "consistent-return": 0,
     "rules": {
-      "no-param-reassign": 0,
       "max-len": 0,
       "no-plusplus": 0,
       "linebreak-style": 0,
       "consistent-return": 0,
       "no-useless-return": 0,
       "no-return-assign": 0,
-      "comma-dangle": 0,
       "arrow-body-style": 0,
-      "max-len": 0,
       "no-unused-vars": 0,
       "no-useless-constructor": 0,
       "import/no-unresolved": 0
