diff --git a/css/customw3styles.css b/css/styles.css
similarity index 100%
rename from css/customw3styles.css
rename to css/styles.css
diff --git a/index.php b/index.php
index 49c3528..b1ac7a0 100644
--- a/index.php
+++ b/index.php
@@ -3,17 +3,19 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>Login</title>
+    <title>myLife - Login</title>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.css"/>
+    <link href="https://fonts.googleapis.com/css?family=Manjari&display=swap" rel="stylesheet">
+
 
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body style="background: #CFGD">
+<body style="background-image: ">
     <div class ="container">
         <div class = "row">
             <div class = "col-lg-6 m-auto">
-                <div class = "card bg-dark mt-5">
-                    <div class="card-title bg-primary text-white mt-5">
-                        <h3 class="text-center py-3">Login to myLife</h3>
+                <div class = "card bg-light mt-5">
+                    <div class="card-title bg-success text-white mt-5">
+                        <h3 class="text-center py-3" style="font-family: 'Manjari', sans-serif;">Login to myLife</h3>
                     </div>
 
                     <?php
@@ -27,15 +29,23 @@
                     
 
                     <div class="card-body">
-                        <form action="php/process.php" method="post">
-                            <input type="text" name="UName" placeholder="Username" class="form-control mb-5">
-                            <input type="password" name="Password" placeholder="Password" class="form-control mb-5">
+                        <form action="php/login.php" method="post">
+                            <input type="text" name="UName" placeholder="Username" class="form-control mb-4">
+                            <input type="password" name="Password" placeholder="Password" class="form-control mb-4">
                             <button class="btn btn-success" name="Login">Login</button>
+                            <br/>
+                            <a href="pages/registration.php">Don't have an account? Sign up here</a>
                         </form>
                     </div>
                 </div>
             </div>
         </div>
     </div>
+
+    <!-- Optional JavaScript -->
+    <!-- jQuery first, then Popper.js, then Bootstrap JS -->
+    <script src="js/jquery-3.3.1.slim.min.js"></script>
+    <script src="js/popper.min.js"></script>
+    <script src="bootstrap-4.1.0/js/bootstrap.min.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/pages/registration.php b/pages/registration.php
new file mode 100644
index 0000000..d216087
--- /dev/null
+++ b/pages/registration.php
@@ -0,0 +1,55 @@
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>myLife - Register</title>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.css"/>
+    <link href="https://fonts.googleapis.com/css?family=Manjari&display=swap" rel="stylesheet">
+
+
+        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
+<body>
+    <div class ="container">
+        <div class = "row">
+            <div class = "col-lg-6 m-auto">
+                <div class = "card bg-light mt-5">
+                    <div class="card-title bg-success text-white mt-5">
+                        <h3 class="text-center py-3" style="font-family: 'Manjari', sans-serif;">Register a myLife Account</h3>
+                    </div>
+
+                    <?php
+                        if($_GET['Invalid'] == true)
+                        {
+                    ?>
+                        <div class="alert-light text-danger text-center py-3"><?php echo $_GET['Invalid']?></div>
+                    <?php
+                     }
+                    ?>
+                    
+
+                    <div class="card-body">
+                        <form action="../php/register.php" method="post">
+                            <input type="text" name="firstname" placeholder="First Name" class="form-control mb-4">
+                            <input type="text" name="lastname" placeholder="Last Name" class="form-control mb-4">
+                            <input type="text" name="email" placeholder="Email" class="form-control mb-4">
+                            <input type="text" name="UName" placeholder="Username" class="form-control mb-4">
+                            <input type="password" name="Password" placeholder="Password" class="form-control mb-4">
+                            <input type="password" name="ConfirmPassword" placeholder="Confirm Password" class="form-control mb-4">
+                            <button class="btn btn-success" name="Register">Register</button>
+                            <br/>
+                            <a href="../index.php">Already have an account? Sign in here</a>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Optional JavaScript -->
+    <!-- jQuery first, then Popper.js, then Bootstrap JS -->
+    <script src="js/jquery-3.3.1.slim.min.js"></script>
+    <script src="js/popper.min.js"></script>
+    <script src="bootstrap-4.1.0/js/bootstrap.min.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/php/login.php b/php/login.php
new file mode 100644
index 0000000..a69f0bd
--- /dev/null
+++ b/php/login.php
@@ -0,0 +1,52 @@
+<?php
+	session_start();
+	require_once('config.php');
+	if(isset($_POST['Login']))
+	{
+		//Make user fills out all fields
+		if(empty($_POST['UName']) || empty($_POST['Password']))
+		{
+			header("location:../index.php?Invalid= Please Fill in the Required Fields");
+		}
+
+		//Assuming they use all fields, log them in
+		else
+		{
+			$username = $_POST['UName'];
+			
+			$query = "SELECT UName FROM users WHERE UName='$username'";
+			$result = mysqli_query($link,$query);
+
+			if(!$result){
+				die('Error1: ' . mysqli_error($link));
+			}
+			$num = mysqli_num_rows($result);
+
+			//Verify that there is only one username
+			if($num==1){
+				$query2 = "SELECT firstname, lastname, UName, Password, email FROM users WHERE UName = '$username'";
+				$result2 = mysqli_query($link, $query2);
+				if(!$result2){
+					die('Error2: ' . mysqli_error($link));
+				}
+				list($first, $last, $userval, $passval, $email) = mysqli_fetch_array($result2);
+				$password = $_POST['Password'];
+				if(password_verify($password, $passval)){
+					$_SESSION['username'] = $userval;
+					$_SESSION['firstname'] = $first;
+					$_SESSION['lastname'] = $last;
+					$_SESSION['email'] = $email;
+					header("location:../pages/dashboard.php");
+				}
+			}
+			else{
+				header("location:../index.php?Invalid= Please Enter Correct Username or Password");
+			}
+		}
+	}
+	else
+	{
+		echo 'Not working now';
+	}
+	
+?>
\ No newline at end of file
diff --git a/php/process.php b/php/process.php
deleted file mode 100644
index 8d1db4e..0000000
--- a/php/process.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-	session_start();
-	require_once('config.php');
-	if(isset($_POST['Login']))
-	{
-		if(empty($_POST['UName']) || empty($_POST['Password']))
-		{
-			header("location:../index.php?Invalid= Please Fill in the Required Fields");
-		}
-		else
-		{
-			$username = $_POST['UName'];
-			$password = $_POST['Password'];
-			$query = "SELECT FROM users WHERE UName='$username' AND Password='$password'";
-			$result = mysqli_query($link,$query);
-			if(mysqli_fetch_assoc($result)){
-				$_SESSION['username'] = $_POST['UName'];
-				header("location:../pages/dashboard.php");
-			}
-			else{
-				header("location:../index.php?Invalid= Please Enter Correct Username or Password");
-			}
-		}
-		
-
-	}
-	else
-	{
-		echo 'Not working now';
-	}
-	
-?>
\ No newline at end of file
diff --git a/php/register.php b/php/register.php
index 8d1db4e..ec564e9 100644
--- a/php/register.php
+++ b/php/register.php
@@ -1,28 +1,43 @@
 <?php
 	session_start();
 	require_once('config.php');
-	if(isset($_POST['Login']))
+	if(isset($_POST['Register']))
 	{
-		if(empty($_POST['UName']) || empty($_POST['Password']))
+		//Catch if user doesn't fill out all data fields
+		if(empty($_POST['UName']) || empty($_POST['Password']) || empty($_POST['firstname']) || empty($_POST['lastname']) || empty($_POST['email']) || empty($_POST['ConfirmPassword']))
 		{
-			header("location:../index.php?Invalid= Please Fill in the Required Fields");
+			header("location:../pages/registration.php?Invalid= Please Fill in the Required Fields");
 		}
+
+		//Assuming all fields are filled out
 		else
 		{
-			$username = $_POST['UName'];
+			//Confirm passwords match
 			$password = $_POST['Password'];
-			$query = "SELECT FROM users WHERE UName='$username' AND Password='$password'";
-			$result = mysqli_query($link,$query);
-			if(mysqli_fetch_assoc($result)){
-				$_SESSION['username'] = $_POST['UName'];
-				header("location:../pages/dashboard.php");
+			$confirmpass = $_POST['ConfirmPassword'];
+			
+			if($password!=$confirmpass){
+				header("location:../pages/registration.php?Invalid= Passwords did not match");
 			}
 			else{
-				header("location:../index.php?Invalid= Please Enter Correct Username or Password");
+			$firstname = $_POST['firstname'];
+			$lastname = $_POST['lastname'];
+			$email = $_POST['email'];
+			$username = $_POST['UName'];
+			
+			$password = password_hash($password, PASSWORD_DEFAULT);
+
+			$query = "INSERT INTO users (firstname, lastname, UName, Password, email) VALUES ('$firstname', '$lastname', '$username', '$password', '$email')";
+			$result = mysqli_query($link, $query);
+				if (!$result){
+        			die('Error: ' . mysqli_error($link));
+      			}
+      			//Successfully Registered
+      			else{
+      				header("location:../index.php");
+      			}
 			}
 		}
-		
-
 	}
 	else
 	{
