Merge remote-tracking branch 'upstream/master'

users/bmintz.json

@@ -1 +1 @@
-{"copyright":"Benjamin Mintz","url":"http:\/\/benmintz.com","theme":"black-beauty"}
+{"copyright":"Benjamin Mintz","theme":"black-beauty"}

users/jakschu.json

@@ -1,7 +1,6 @@
 { 
-  "copyright": "Jakob Schurdak, https://jakschu.de",
-  "url": "https://jakschu.de",
-  "email": "i@jakschu.de",
+  "copyright": "Jakob Schurdak",
+  "email": "i@jakschu.cf",
   "gravatar": true,
   "theme": "double-windsor"
 }

users/marco.json

@@ -1,4 +1,4 @@
 {
-  "copyright": "Marco Krage, http://my-azur.de",
+  "copyright": "Marco Krage, https://my-azur.de",
   "url": "https://my-azur.de"
 }

users/marvinede.json

@@ -0,0 +1,5 @@
+{
+  "copyright": "Marvin Ede",
+  "email": "marvinede@gmx.net",
+  "format": "txt"
+}

users/micxer.json

@@ -1,7 +1,7 @@
 {
-    "copyright": "micxer",
+    "copyright": "micxer, http:\/\/micxer.de/blog",
     "url":       "http:\/\/micxer.de/blog",
     "email":     "micxer@micxer.de",
     "format":    "html",
-    "theme":     "double-windsor"
+    "theme":     "material-light-blue"
 }

users/web.json

@@ -0,0 +1,7 @@
+{
+  "copyright": "Chris Weber, http://www.lookout.net",
+  "url": "http://www.lookout.net",
+  "email": "chrisweber@live.com",
+  "format": "html",
+  "gravatar": true
+}

users/witchard.json

@@ -1 +1 @@
-{"copyright":"Ben Witchard"}
+{"copyright":"witchard, http://witchard.github.io/", "url": "http://witchard.github.io/"}