Fix merge conflicts

CONTRIB.md

@@ -62,4 +62,4 @@ If you e.g. add a new column or table, you'll need to migrate the database. You
 `python migrate_db.py`
 
 to do this.
-`python upgrade_db.py` and `python downgrade_db.py` can also be used as necessary. Note that I followed [this tutorial](http://blog.miguelgrinberg.com/post/the-flask-mega-tutorial-part-iv-database) to set this up.
+`python upgrade_db.py` and `python downgrade_db.py` can also be used as necessary. Note that I followed [this tutorial](http://blog.miguelgrinberg.com/post/the-flask-mega-tutorial-part-iv-database) to set this up.

OpenOversight/app/utils.py

@@ -64,7 +64,6 @@ def sort_officers_by_photos(all_officers, officers_w_images):
 
     return officers, all_officer_images
 
-
 def allowed_file(filename):
     return '.' in filename and \
         filename.rsplit('.', 1)[1] in config.ALLOWED_EXTENSIONS

OpenOversight/app/views.py

@@ -34,7 +34,7 @@ def get_gallery():
     return render_template('gallery.html',
                            officers=sorted_officers,
                            form=form_values,
-		                       officer_images=officer_images)
+		           officer_images=officer_images)
 
 
 @app.route('/complaint', methods=['GET', 'POST'])

OpenOversight/test_data.py

@@ -73,10 +73,10 @@ def cleanup():
     assignments = models.Assignment.query.all()
     for assn in assignments:
         db.session.delete(assn)
-
-    images = models.Image.query.all()
-    for image in images:
-        db.session.delete(image)
+   
+    faces = models.Face.query.all()
+    for face in faces:
+        db.session.delete(face)
 
     # TODO: Reset primary keys on all these tables
     db.session.commit()