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

Conflicts:
	githubTestProject/src/test/Hello.java
Merge pull request #6 from gunpei/issue3

編集