Merged conflict test

routes.py

@@ -9,3 +9,8 @@ def home():
 @glob.app.route("/regninger")
 def serve_regninger():
 	return render_template("regninger.html")
+
+@glob.app.route("/kvittering")
+def serve_kvittering():
+	return render_template("kvittering.html") 
+	

templates/kvittering.html

@@ -0,0 +1,10 @@
+{% set title = "Kvitteringer" %}
+
+{% extends "layout/bootstrap.html" %}
+
+{% block content %}
+
+<p>Tester siden!</p>
+<p>KVITTERINGER FOR FAEN!</p>
+
+{% endblock %}