[master]files add
Merge remote-tracking branch 'origin/master'
Merge pull request #1 from tottori/master

merged