Merge remote-tracking branch 'fork/feature/ui' into feature/ui

Conflicts:
	templates/graph_base.html
	templates/navbar.html
	urls.py
	views.py

templates/graph_base.html

@@ -17,8 +17,11 @@ h1.placeholder {
   {% block graph %}<h1 class="placeholder">PUT A GRAPH HERE</h1>{% endblock %}
 </div>
 {% endblock container %}
+<<<<<<< HEAD
 
 {% block body_js %}
 <script src="{{ STATIC_URL }}js/jquery.js"></script>
 <script src="{{ STATIC_URL }}bootstrap/js/bootstrap-dropdown.js"></script>
 {% endblock %}
+=======
+>>>>>>> fork/feature/ui

templates/navbar.html

@@ -4,6 +4,7 @@
     <div class="container-fluid">
         <a class="brand" href="">Cool name</a>
         <ul class="nav">
+<<<<<<< HEAD
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">My Repos</a>
             <ul class="dropdown-menu">
@@ -23,6 +24,12 @@
               <li><a href="#">Logout</a></li>
             </ul>
           </li>
+=======
+          <li><a href="{% url index %}">Followers</a></li>
+        </ul>
+        <ul class="nav pull-right">
+          <li><a href="">Logout</a></li>
+>>>>>>> fork/feature/ui
         </ul>
     </div>
   </div>