update
merged
Merge remote-tracking branch 'inajob/master'
update
update general word
Merge pull request #1 from kuidaoring/master

めんたいこおおお　　ok