Merge branch 'master' into 'test/20200416-test'

# Conflicts:
#   .idea/vcs.xml
#   test-output/report.html

.idea/$PRODUCT_WORKSPACE_FILE$

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="masterDetails">
+    <states>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
+</project>
\ No newline at end of file

README.md

+# kejiji
+