repaired celery, c2 error, finish merge

rowers/templates/teams.html

@@ -100,7 +100,25 @@
           </tr>
           {% endfor %}
         </tbody>
+      </table>
+        <h3>Manual code redeem</h3>
+      <div class="grid_4 alpha">
+      <form enctype="multipart/form-data" action="{{ formloc }}" method="post">
+        {% if form.errors %}
+        <p style\"color: red;">
+          Please correct the error{{ form.errors|pluralize }} below.
+        </p>
+        {% endif %}
+        {% csrf_token %}
+        <table>
+        {{ form.as_table }}
         </table>
+      </div>
+      
+      <div id="formbutton" class="grid_1 suffix_1 omega">
+        <input class="button green" type="submit" value="Submit">
+      </div>
+      </form>
     </p>
     {% else %}
     <p>&nbsp;</p>