提交预研及团队守则
Merge branch 'master' of https://github.com/shev-test-org/st.git

Conflicts:
	TestProject/src/HelloWorld.java