マスター直
えーい
Merge branch 'master' of https://github.com/gunpei/githubTest.git into
test

Conflicts:
	githubTestProject/src/test/Hello.java