diff --git a/packages/react-scripts/template/.editorconfig b/packages/react-scripts/template/.editorconfig
new file mode 100644
index 00000000000..241a5ce1d6a
--- /dev/null
+++ b/packages/react-scripts/template/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+end_of_line = LF
+charset = utf-8
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+max_line_length = 120
diff --git a/packages/react-scripts/template/.eslintrc.json b/packages/react-scripts/template/.eslintrc.json
new file mode 100644
index 00000000000..8d3870ff6d2
--- /dev/null
+++ b/packages/react-scripts/template/.eslintrc.json
@@ -0,0 +1,29 @@
+{
+    "env": {
+        "browser": true,
+        "commonjs": true,
+        "es6": true,
+        "node": true
+    },
+    "parser": "babel-eslint",
+    "parserOptions": {
+        "ecmaFeatures": {
+            "jsx": true
+        },
+        "sourceType": "module"
+    },
+    "plugins": [
+      "react"
+    ],
+    "rules": {
+        "no-const-assign": "warn",
+        "no-this-before-super": "warn",
+        "no-undef": "warn",
+        "no-unreachable": "warn",
+        "no-unused-vars": "warn",
+        "constructor-super": "warn",
+        "valid-typeof": "warn",
+        "react/jsx-uses-react": "error",
+        "react/jsx-uses-vars": "error"
+    }
+}
\ No newline at end of file
diff --git a/packages/react-scripts/template/public/favicon.ico b/packages/react-scripts/template/public/favicon.ico
index 5c125de5d89..063787a0eb7 100644
Binary files a/packages/react-scripts/template/public/favicon.ico and b/packages/react-scripts/template/public/favicon.ico differ