create project
Merge branch 'master' of https://github.com/ZhongGuan/Projects.git
1
1
Merge branch 'master' of https://github.com/ZhongGuan/Projects.git

Conflicts:
	JavaStudy/src/test/Main.java