From 10352360d9435d7940b0a64e2c2a64a32aede3fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20My=C5=9Bliwiec?= <mail@kamilmysliwiec.com>
Date: Wed, 13 Sep 2017 12:57:16 +0200
Subject: [PATCH] Auto stash before merge of "master" and "origin/master"

---
 README.md   |  4 ++--
 tslint.json | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 tslint.json

diff --git a/README.md b/README.md
index 1f7d152..2fc7a34 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-[![Nest Logo](http://kamilmysliwiec.com/public/nest-logo.png)](http://kamilmysliwiec.com/)
+[![Nest Logo](http://kamilmysliwiec.com/public/nest-logo.png)](http://nestjs.com/)
 
-<img src="https://github.com/remojansen/logo.ts/blob/master/ts.png?raw=true" width="18">  TypeScript Starter repository for [Nest](https://github.com/kamilmysliwiec/nest) framework.
+The [Nest](https://github.com/kamilmysliwiec/nest) framework starter repository. 
 
 ## Installation
 
diff --git a/tslint.json b/tslint.json
new file mode 100644
index 0000000..db3df4c
--- /dev/null
+++ b/tslint.json
@@ -0,0 +1,53 @@
+{
+    "defaultSeverity": "error",
+    "extends": [
+        "tslint:recommended"
+    ],
+    "jsRules": {
+        "no-unused-expression": true
+    },
+    "rules": {
+        "eofline": false,
+        "quotemark": [
+            true,
+            "single"
+        ],
+        "member-access": [
+            false
+        ],
+        "ordered-imports": [
+            false
+        ],
+        "max-line-length": [
+            150
+        ],
+        "member-ordering": [
+            false
+        ],
+        "curly": false,
+        "interface-name": [
+            false
+        ],
+        "array-type": [
+            false
+        ],
+        "no-empty-interface": false,
+        "no-empty": false,
+        "arrow-parens": false,
+        "object-literal-sort-keys": false,
+        "no-unused-expression": false,
+        "max-classes-per-file": [
+            false
+        ],
+        "variable-name": [
+            false
+        ],
+        "one-line": [
+            false
+        ],
+        "one-variable-per-declaration": [
+            false
+        ]
+    },
+    "rulesDirectory": []
+}
\ No newline at end of file