Merge branch 'master' into generated

Conflicts:
	.gitignore

diff --cc .gitignore
index 69e36a46f4a07c7d4129537f68ac096759daec26,f0fb820c308b76816023022bdf351007e741d9b3..0a393500ce74dd1623ff2abe95a7fd614d31a2db
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -11,3 -11,16 +11,11 @@@
  /mass_matrix_2d/mass_matrix_f?_p?_q?.ufl
  /mass_matrix_2d/mass_matrix_f?_p?_q?_tensor.ufl
  /mass_matrix_2d/mass_matrix_f?_p?_q?_quadrature.ufl
 -/mass_matrix_2d/mass_matrix_f?_p?_q?_tensor.h
 -/mass_matrix_2d/mass_matrix_f?_p?_q?_quadrature.h
 -/mass_matrix_2d/mass_matrix_f?_p?_q?_excafe.h
+ /laplacian_2d/ufl_rules.mk
+ /laplacian_2d/benchmark_f?_p?_q?
+ /laplacian_2d/benchmark_f?_p?_q?.cpp
+ /laplacian_2d/laplacian_f?_p?_q?.cpp
+ /laplacian_2d/laplacian_f?_p?_q?.ufl
+ /laplacian_2d/laplacian_f?_p?_q?_tensor.ufl
+ /laplacian_2d/laplacian_f?_p?_q?_quadrature.ufl
 -/laplacian_2d/laplacian_f?_p?_q?_tensor.h
 -/laplacian_2d/laplacian_f?_p?_q?_quadrature.h
 -/laplacian_2d/laplacian_f?_p?_q?_excafe.h
++>>>>>>> master