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