Merge remote-tracking branch 'origin/dev'

.gitignore

@@ -7,3 +7,4 @@
 /algorithm/file/
 __pycache__/*
 /resources/need_finish_files/*
+/static/*