Merge branch 'Goryudyuma-master'
細かい変更
z==0判定を最優先に。
あとは好みの問題。
Merge branch 'Goryudyuma-master'
Merge branch 'Goryudyuma-master'