Merge branch 'develop'

modified:   .idea/misc.xml
	modified:   README.md
	new file:   "\345\256\236\350\267\265\350\265\204\346\272\220-\345\260\217\347\261\263\344\276\277\347\255\276\345\274\200\346\272\220\344\273\243\347\240\201\347\232\204\346\263\233\350\257\273\346\212\245\345\221\212\346\250\241\346\235\277.docx"

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_16" project-jdk-name="Android API 32 Platform" project-jdk-type="Android SDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

README.md

@@ -27,5 +27,4 @@
 
 3. Regarding feature request and general discussion, please visit Micode forum,
    http://micode.net/forum.php?mod=forumdisplay&fid=38
-
+   <<<<<<< HEAD
-