Integrate sidebar and navbar into app

Signed-off-by: Sachin S. Kamath <sskamath96@gmail.com>

hodor/static/css/sidebar.css

@@ -25,7 +25,6 @@ overflow:visible;
   margin-top: 3.2em;
   margin-top: 50px !important;
 background:#101010;
-border-right:1px solid #e5e5e5;
 position:absolute;
 top:0;
 bottom:0;
@@ -139,4 +138,3 @@ height: 100%;
 url(http://themes.googleusercontent.com/static/fonts/titilliumweb/v2/anMUvcNT0H1YN4FII8wpr24bNCNEoFTpS2BTjF6FB5E.woff)
 format('woff');
 }
-

hodor/templates/layout/nav-app.html

+<nav class="navbar navbar-expand-lg navbar-dark justify-content-between hodor-nav" style="background-color:#101010;">
+    <div class="container-fluid">
+        <div class="row">
+            <a class="navbar-brand nav-hodor float-sm-left" href="#">
+                <img src="{{ url_for('static', filename='img/hodor-inverse.png') }}" width="60" class="d-inline-block align-top" alt="">
+            </a>
+        </div>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse" id="navbarText">
+            <ul class="nav navbar-nav mr-auto"></ul> <!-- Stupid Bootstrap -->
+            <ul class="nav navbar-nav">
+                <span class="navbar-text mr-4">
+                    <!-- TO DO: Change Guest to a variable -->
+                    Welcome, <span style="font-weight: bolder; color: white;"> Guest</span>
+                </span>
+                <ul class="nav-item">
+                    <button class="btn btn-outline-success my-2 my-sm-0 mr-3 cd-signin" >Sign In</button>
+                    <button class="btn btn-outline-info my-2 my-sm-0 mr-3 cd-signup" >Register</button>
+                </ul>
+            </ul>
+    </div>
+    </div>
+</nav>

hodor/templates/layout/sidebar.html

-
+{% include 'layout/nav-app.html' %}
 <div class="area">
 </div>
 <nav class="main-menu">