編集2
Merge pull request #7 from gunpei/issue4

編集2
Merge remote-tracking branch 'origin/develop' into issue3

Conflicts:
	githubTestProject/src/test/Hello.java