Merge remote-tracking branch 'origin/master'

nnnjjj123

2020-11-06 cc3cc145a8cc38dcb2fc123b671fac0c39450a33

 .gitignore

@@ -1,3 +1,4 @@
# Editor directories and files
.idea
.vscode
.vscode
data/