merged

--- a/src/HOL/ROOT	Tue Sep 04 22:33:19 2018 +0200
+++ b/src/HOL/ROOT	Wed Sep 05 05:05:26 2018 +0200
@@ -65,6 +65,7 @@
     "HOL-Library"
     "HOL-Computational_Algebra"
   theories
+    L2_Norm
     Analysis
   document_files
     "root.tex"