2ターン目　先攻　maabe
Merge branch 'master' of https://github.com/santyu/test

Conflicts:
	conflict.md