第一次提交
Merge branch 'master' of https://github.com/jnan88/MyJavaSamples.git

Conflicts:
	.gitignore