1ターン目　後攻　hfujita
Merge branch 'master' of https://github.com/santyu/test into develop

Conflicts:
	conflict.md