初始化
1.新增helloworld
2.新增gitignore
Merge branch 'master' of https://github.com/soon530/scjp_study.git

Conflicts:
	.gitignore