林崎コミット
競合解決

Conflicts:
	WEB-INF/src/jp/co/valuenet/githubtest/servlet/MainServlet.java
Merge pull request #1 from gunpei/hayashizaki

Hayashizaki