Merge branch 'master' of https://github.com/Cook-R/JavaGitProject

Cook-R · Cook-R · commit 40f6d779fe18 · 2019-03-19T20:54:14.000+08:00
# Conflicts:
#	.gitignore
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,7 @@
+.metadata
+.settings
+*
+*.iml
 .idea
 .settings
 /.metadata
