fix README
resolve conflicts
Merge branch 'hidenorigoto-fix_readme'
that was a terrible merge. fixing it with this. sorry @hidenori_goto