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

Conflicts:
	githubTestProject/src/test/Hello.java
Merge pull request #7 from gunpei/issue4

編集2
Merge pull request #6 from gunpei/issue3

編集
issue5コミット
issue6
Merge pull request #9 from gunpei/issue5

issue5コミット
Merge remote-tracking branch 'origin/develop' into issue6

Conflicts:
	githubTestProject/src/test/Hello.java
Merge pull request #8 from gunpei/issue6

issue6
develop直更新
develop直更新２回目
a
Merge pull request #10 from gunpei/develop

test
test
Merge branch 'master' of https://github.com/gunpei/githubTest.git into
test

Conflicts:
	githubTestProject/src/test/Hello.java