From f2f4de0c03e8d60a597e585942c33fece6bfc2ec Mon Sep 17 00:00:00 2001
From: Koushik M L N <koushik@itversity.in>
Date: Fri, 22 Jun 2018 15:50:49 +0530
Subject: [PATCH] Modified ReadMe.md

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 24cc48b..a8a6234 100644
--- a/README.md
+++ b/README.md
@@ -16,9 +16,15 @@ time.
 
 ## Run on HTTP
 
+<<<<<<< HEAD
 ```bash
 wetty -p 3000
 ```
+=======
+*  `npm config set python python2.7` If you are using python3 as default
+
+*  `npm install`
+>>>>>>> Modified ReadMe.md
 
 If you run it as root it will launch `/bin/login` (where you can specify the
 user name), else it will launch `ssh` and connect by default to `localhost`.
@@ -112,6 +118,8 @@ use:
 http://yourserver.com/wetty
 ```
 
+**Note that if your Nginx is configured for HTTPS you should run wetty without SSL.**
+
 Else if you are running `bin/index.js` as a regular user you can use:
 
 ```