Merge branch 'refs/heads/develop' into feature/zuyuan1

# Conflicts:
#	readme.md

readme.md

@@ -2,9 +2,4 @@ This is zuyuan2
 This is zuyuan1
 This is zuyuan1,666
 ///hhh
-
-hellothisis zuyuan1
-456456
-5464
-
-woqcuole
+hellothisis zuyuan2

settings.json

@@ -0,0 +1,3 @@
+{
+  "this":"json"
+}