麻痹，本地git文件丢了
Merge branch 'master' of https://github.com/qatang/java_test

Conflicts:
	.gitignore