merge master branch
@2 amidakuji commit
@2 bit tetris commit
@2 fix indata's encoding of amidakuji
merge m-kishi branch with @2