コンフリクトテスト2
Merge branch 'master' of https://github.com/nakatani-kazuki/CPP_study_201405

Conflicts:
	sugimoto/necoCPP/neco.cpp