Merge branch 'feature/ui' of github.com:erynofwales/rogueojiiofwales into feature/ui

Conflicts:
	templates/graph_base.html
	templates/navbar.html

templates/navbar.html

@@ -23,6 +23,10 @@
               <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>
         </ul>
     </div>
   </div>