Merge asterix_lsm_stabilization into madhusudancs/parallelize_result_distribution.
diff --git a/.gitignore b/.gitignore
index 6d41006..d748fde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@
 asterix-app/mdtest/
 asterix-app/opttest/
 build
-asterix_logs
+asterix_logs
\ No newline at end of file