diff --git a/server.py b/server.py
index accc357c8a65f430f4e861a6bb99565e91a3cc6c..9374335a3f2ca66cba5391775ccde7ae48eee835 100644
--- a/server.py
+++ b/server.py
@@ -4,9 +4,13 @@ import json
 import database_helper as database_helper
 import re
 from flask_sock import Sock
+from flask_cors import CORS
+
 import time
 app = Flask(__name__)
 sock = Sock(app)
+CORS(app)
+
 
 # function to signin the user with post method
 # We will expect 2 string values email address password.
@@ -296,7 +300,7 @@ def get_user_messages_by_token():
 def get_user_messages_by_email():
     token = request.headers.get("token", "")
     email = request.form.get("email", "")
-    
+
     if len(token) == 0:
         return json.dumps({"success": False, "message": "Token missing or incorrect."}), 401
 
@@ -337,8 +341,9 @@ def post_message():
     recipient_email = request.form.get("email", "")
     token = request.headers.get("token", "")
     message = request.form.get("message", "")
-    
-    print("recipient_email" + recipient_email + " message" + message + " token" + token)
+
+    print("recipient_email" + recipient_email +
+          " message" + message + " token" + token)
 
     if len(token) == 0:
         return json.dumps({"success": False, "message": "Token missing or incorrect."}), 401
@@ -347,21 +352,21 @@ def post_message():
         return json.dumps(
             {"success": False, "message": "Form data missing or incorrect type."}
         ), 403
-  
+
     # validate token
     result = database_helper.find_token(token)
     if (len(result["data"])) == 0:
         return json.dumps({"success": False, "message": "You are not logged in."}), 401
-    
+
     curr_user_email = result["data"][0][1]
 
     # validate email
-    if recipient_email:        
+    if recipient_email:
         result = database_helper.find_user_by_email(recipient_email)
         if result["status"] == True and (len(result["data"])) == 0:
             return json.dumps({"success": False, "message": "Invalid user email"}), 401
     else:
-         recipient_email = curr_user_email
+        recipient_email = curr_user_email
 
     result = database_helper.add_message_and_email(
         curr_user_email, message, recipient_email
@@ -374,6 +379,8 @@ def post_message():
 
 # function to Validate token
 # We will expect 1 string values token.
+
+
 @app.route("/validate_token", methods=["GET"])
 def validate_token():
     token = request.headers.get("token", "")
@@ -381,14 +388,14 @@ def validate_token():
         return json.dumps({"success": True, "message": "Valid Token"}), 201
     else:
         return json.dumps({"success": False, "message": "Invalid Token"}), 401
-    
+
 
 @sock.route('/api')
 def handle_websocket(ws):
     if not ws:
         return json.dumps({'Expected WebSocket request.'}), 401
 
-    token  = ws.receive()
+    token = ws.receive()
     while True:
         time.sleep(2)
         print("1 = ", token)
@@ -396,9 +403,12 @@ def handle_websocket(ws):
         result = database_helper.find_token(token)
         print("len = ", len(result["data"]))
         if (len(result["data"])) == 0:
-            ws.send(json.dumps({"success": True, "message": "User signed out"}))
+            ws.send(json.dumps(
+                {"success": True, "message": "User signed out"}))
 
 # function to load template
+
+
 @app.route('/')
 def index():
     return send_from_directory('static', 'client.html'), 200