diff -r e761943fba93 -r b28d5c14c5c2 templates/footer.html
--- a/templates/footer.html	Wed Jan 08 19:38:49 2014 +0100
+++ b/templates/footer.html	Fri Jan 17 11:59:43 2014 +0100
@@ -1,7 +1,12 @@
+<<<<<<< local
 
 <div class="navbar navbar-default navbar-default-bottom" style="background-color:#fff;">
 
+=======
+<div id="footer">
+>>>>>>> other
   <div class="container">
+<<<<<<< local
    <div style="background-color:#fff;"> 
     <div class="separator">
       <img src="/static/images/python-logo.png" alt="python-logo" />
@@ -26,3 +31,8 @@
 </div>
 </div>
 
+=======
+    <img src="/static/images/python-logo.png" alt="python-logo" />
+    <h3>Places for Sponsors</h3>
+  </div>
+</div>>>>>>>> other