Merge remote-tracking branch 'origin/master'

# Conflicts:
#	data-dev.sqlite

k8s/web-methodology-deployment.yaml

@@ -0,0 +1,22 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+    name: web-methodology-deployment
+    labels:
+        web: methodology
+spec:
+    replicas: 2
+    selector:
+        matchLabels:
+            web: methodology
+    template:
+        metadata:
+            labels:
+                web: methodology
+        spec:
+            containers:
+            - name: web-methodology
+              image: echo0821/web-methodology
+              ports:
+              - containerPort: 5000
+

k8s/web-methodology-services.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+    name: web-methodology-services
+spec:
+    selector:
+       web: methodology
+    ports:
+     - protocol: TCP
+       port: 80
+       targetPort: 5000
+