diff --git a/static/CSS/loginstyle.css b/static/CSS/loginstyle.css
index dcb9b6845e58916f793bc9f3e02e554da07a83d2..2c44a02a44c292502c7c4862d8e8b78d86024f40 100644
--- a/static/CSS/loginstyle.css
+++ b/static/CSS/loginstyle.css
@@ -22,4 +22,8 @@ body{
     font-family: 'Sora', sans-serif;
     background-color: #212529;
     color: white;
+<<<<<<< HEAD
 }
+=======
+}
+>>>>>>> 9c7255d510762a8f16afeba2657cad4a0f8b8239
diff --git a/static/landingpage.html b/static/landingpage.html
index b56e8fd9532a49e78e2bf27015a65014f5bd3d18..cc325be3feb9eb530c86f7f133f36e970c2ef94c 100644
--- a/static/landingpage.html
+++ b/static/landingpage.html
@@ -31,7 +31,7 @@
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
   <link href="https://fonts.googleapis.com/css2?family=Sora:wght@800&display=swap" rel="stylesheet">
-  <link rel="stylesheet" href="landingstyle.css">
+  <link rel="stylesheet" href="CSS/landingstyle.css">
   <title>Tramshed Tech</title>
   <img id="tramshed" src="Media/tramshed.jpg">
   <div class="bg-dark p-3">
diff --git a/static/login.html b/static/login.html
index c76f858a582dfd602be21343a4f7ebeba22bb3f8..5bbe1b72a5529fc7b8b0ff4c1c3fa16cd0b44f59 100644
--- a/static/login.html
+++ b/static/login.html
@@ -25,13 +25,21 @@
         <form>
             <!-- Email input -->
             <div class="form-outline mb-4">
+<<<<<<< HEAD
+                <input type="email" id="recordEmail" class="form-control" />
+=======
                 <input type="email" id="form2Example1" class="form-control" />
+>>>>>>> 9c7255d510762a8f16afeba2657cad4a0f8b8239
                 <label class="form-label" for="form2Example1">Email address</label>
             </div>
   
             <!-- Password input -->
             <div class="form-outline mb-4">
+<<<<<<< HEAD
+                <input type="password" id="recordPassword" class="form-control" />
+=======
                 <input type="password" id="form2Example2" class="form-control" />
+>>>>>>> 9c7255d510762a8f16afeba2657cad4a0f8b8239
                 <label class="form-label" for="form2Example2">Password</label>
             </div>
   
@@ -60,4 +68,8 @@
             <p>Not a member? <a href="#!">Register</a></p>
         </form>
     </body>
+<<<<<<< HEAD
 </html>
+=======
+</html>
+>>>>>>> 9c7255d510762a8f16afeba2657cad4a0f8b8239
diff --git a/testloginserver.py b/testloginserver.py
new file mode 100644
index 0000000000000000000000000000000000000000..a28f96dad8ccf4b267f013c3699da65f0ade7f50
--- /dev/null
+++ b/testloginserver.py
@@ -0,0 +1,46 @@
+import os
+import sqlite3
+from flask import Flask, redirect, request, render_template, jsonify
+
+app = Flask(__name__)
+DATABASE = "login.db"
+
+ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif'])
+
+@app.route("/SearchRecord", methods=['POST'])
+def searchRecord():
+
+    if request.method =='POST':
+        try:
+            recordEmail = request.form.get('recordEmail', default="Error")
+            conn = sqlite3.connect(DATABASE)
+            cur = conn.cursor()
+            cur.execute("SELECT * FROM login WHERE Email=?;", [recordEmail])
+            recordData = cur.fetchall()
+        except:
+            print(f"Error: {recordData}")
+            conn.close()
+        finally:
+            conn.close()
+            print(f"{str(recordData)} Record found.")
+            return str(recordData)
+
+@app.route("/AddRecord", methods=['POST'])
+def addRecord():
+    if (request.method == 'POST'):
+        recordEmail = request.form['recordEmail']
+        recordPassword = request.form['recordPassword']
+        conn = sqlite3.connect(DATABASE)
+        cur = conn.cursor()
+        cur.execute("INSERT INTO login ('Email', 'Password')\
+                    VALUES (?,?)", (recordEmail, recordPassword))
+        conn.commit()
+        conn.close()
+
+        infoMessage = (f'{recordData} Record added.')
+
+    print(infoMessage)
+    return (infoMessage)
+    
+if __name__ == "__main__":
+    app.run(debug=True)
\ No newline at end of file