From fc6071f41dcd6b75343fa90de92767c149edb0e0 Mon Sep 17 00:00:00 2001
From: Dale Pancho <dalepancho7@gmail.com>
Date: Thu, 24 Oct 2019 10:50:48 -0700
Subject: [PATCH 1/3] .

---
 src/App.css | 4 ++--
 src/App.js  | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/App.css b/src/App.css
index da16fef4..7daa66d6 100644
--- a/src/App.css
+++ b/src/App.css
@@ -25,7 +25,8 @@ nav{
   display: flex;
   justify-content: space-around;
   align-content: center;
-  min-height: 10vh;
+  align-items: center;
+  min-height: 75px;
   background: #1DA1F2;
   color: white;
   }
@@ -34,7 +35,6 @@ nav{
     width: 30%;
     display: flex;
     justify-content: space-around;
-    align-items: center;
     list-style: none;
   }
 
diff --git a/src/App.js b/src/App.js
index a659ff2f..5cc1b888 100644
--- a/src/App.js
+++ b/src/App.js
@@ -16,8 +16,6 @@ function App() {
 			<p>or</p>
 			<Route path="/" component={Login} />
 			<PrivateRoute exact path ="/TwitterGame" component={TwitterGame} />
-
-
 		</div>
 	);
 }

From 66bf3aab1c2ce29e07ee0477dce4459e132c8e69 Mon Sep 17 00:00:00 2001
From: Dale Pancho <dalepancho7@gmail.com>
Date: Thu, 24 Oct 2019 12:05:44 -0700
Subject: [PATCH 2/3] ...

---
 src/App.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/App.js b/src/App.js
index c214ff1b..76f1fa6a 100644
--- a/src/App.js
+++ b/src/App.js
@@ -27,18 +27,11 @@ function App() {
 		<div className="App">
 			{test()}
 			<Nav />
-<<<<<<< HEAD
-			<Route path="/" component={SignUp} />
-			<p>or</p>
-			<Route path="/" component={Login} />
-			<PrivateRoute exact path ="/TwitterGame" component={TwitterGame} />
-=======
 
         <Route path="/" render={props => (<Login {...props} loggedInUser={loggedInUser} setLoggedInUser={setLoggedInUser} loginOrRegister={loginOrRegister} setLoginOrRegister={setLoginOrRegister}/>)} />
 			
 			<PrivateRoute exact path ="/TwitterGame" component={TwitterGame} />
 
->>>>>>> 484bbbbef006e8eeb9d2ff59f92035da69c73cbf
 		</div>
 	);
 }

From 1eebbfb8a5a7379a21869fff3610b854633d8437 Mon Sep 17 00:00:00 2001
From: Dale Pancho <dalepancho7@gmail.com>
Date: Thu, 24 Oct 2019 12:29:38 -0700
Subject: [PATCH 3/3] Maaaaybe

---
 src/components/Nav.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Nav.js b/src/components/Nav.js
index 627dc2bd..e3630854 100644
--- a/src/components/Nav.js
+++ b/src/components/Nav.js
@@ -7,7 +7,7 @@ import Login from "./Login";
 // Navigation bar components
 function Nav() {
     return (
-        <Router>
+        <Route>
         <nav>
             <img src={TwitterIcon} width="50" height="50"/>
             <ul className="nav-links">
@@ -15,7 +15,7 @@ function Nav() {
                 <Link to="/" className="navbar-button">Login/Signup</Link>
             </ul>
         </nav>
-        </Router>
+        </Route>
     )
 }