Merge remote-tracking branch 'template/master' into development_template

templates/page.html

@@ -5,6 +5,16 @@
 <main>
     <script src="https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js"></script>
     <script>mermaid.initialize({startOnLoad:true});</script>
+<<<<<<< HEAD
     {{page.content | safe}}
+=======
+    <div>
+        {% if page %}
+            {{page.content | safe}}
+        {% else %}
+            {{section.content | safe}}
+        {% endif %}
+    </div>
+>>>>>>> template/master
 
  </main> {% endblock content %}