添加一些可忽略的文件
Merge branch 'master' of github.com:suntreestar/template_java

Conflicts:
	.classpath
	.settings/org.eclipse.jdt.core.prefs